Menu
▾
▴
web-erp-developers — Discussion on development of webERP
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(20) |
Aug
(21) |
Sep
(12) |
Oct
(2) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(3) |
Feb
(46) |
Mar
(65) |
Apr
(49) |
May
(33) |
Jun
(5) |
Jul
(79) |
Aug
(228) |
Sep
(347) |
Oct
(272) |
Nov
(270) |
Dec
(424) |
| 2005 |
Jan
(549) |
Feb
(232) |
Mar
(134) |
Apr
(103) |
May
(57) |
Jun
(74) |
Jul
(67) |
Aug
(45) |
Sep
(99) |
Oct
(187) |
Nov
(238) |
Dec
(127) |
| 2006 |
Jan
(81) |
Feb
(137) |
Mar
(46) |
Apr
(55) |
May
(62) |
Jun
(152) |
Jul
(137) |
Aug
(154) |
Sep
(176) |
Oct
(104) |
Nov
(65) |
Dec
(64) |
| 2007 |
Jan
(56) |
Feb
(303) |
Mar
(88) |
Apr
(80) |
May
(72) |
Jun
(20) |
Jul
(47) |
Aug
(28) |
Sep
(113) |
Oct
(49) |
Nov
(89) |
Dec
(24) |
| 2008 |
Jan
(24) |
Feb
(61) |
Mar
(43) |
Apr
(51) |
May
(12) |
Jun
(10) |
Jul
(49) |
Aug
(26) |
Sep
(7) |
Oct
(50) |
Nov
(19) |
Dec
(15) |
| 2009 |
Jan
(87) |
Feb
(144) |
Mar
(54) |
Apr
(72) |
May
(32) |
Jun
(23) |
Jul
(27) |
Aug
(90) |
Sep
(349) |
Oct
(174) |
Nov
(320) |
Dec
(110) |
| 2010 |
Jan
(162) |
Feb
(39) |
Mar
(80) |
Apr
(126) |
May
(45) |
Jun
(44) |
Jul
(75) |
Aug
(32) |
Sep
(100) |
Oct
(57) |
Nov
(49) |
Dec
(125) |
| 2011 |
Jan
(72) |
Feb
(41) |
Mar
(63) |
Apr
(18) |
May
(123) |
Jun
(100) |
Jul
(96) |
Aug
(84) |
Sep
(83) |
Oct
(39) |
Nov
(166) |
Dec
(103) |
| 2012 |
Jan
(158) |
Feb
(148) |
Mar
(77) |
Apr
(43) |
May
(126) |
Jun
(82) |
Jul
(67) |
Aug
(28) |
Sep
(109) |
Oct
(30) |
Nov
(23) |
Dec
(34) |
| 2013 |
Jan
(14) |
Feb
(16) |
Mar
(7) |
Apr
(79) |
May
(76) |
Jun
(13) |
Jul
(76) |
Aug
(36) |
Sep
(22) |
Oct
(35) |
Nov
(167) |
Dec
(93) |
| 2014 |
Jan
(64) |
Feb
(14) |
Mar
(57) |
Apr
(63) |
May
(60) |
Jun
(15) |
Jul
(24) |
Aug
(19) |
Sep
(56) |
Oct
(70) |
Nov
(45) |
Dec
(52) |
| 2015 |
Jan
(56) |
Feb
(73) |
Mar
(34) |
Apr
(11) |
May
(24) |
Jun
(19) |
Jul
(11) |
Aug
(8) |
Sep
(25) |
Oct
(22) |
Nov
(38) |
Dec
(7) |
| 2016 |
Jan
(7) |
Feb
(34) |
Mar
(17) |
Apr
(10) |
May
(17) |
Jun
(7) |
Jul
(17) |
Aug
(31) |
Sep
(3) |
Oct
(34) |
Nov
(5) |
Dec
(2) |
| 2017 |
Jan
|
Feb
(4) |
Mar
(18) |
Apr
(6) |
May
(10) |
Jun
(13) |
Jul
|
Aug
|
Sep
|
Oct
(6) |
Nov
|
Dec
(1) |
| 2018 |
Jan
(2) |
Feb
|
Mar
(3) |
Apr
(10) |
May
(5) |
Jun
|
Jul
(7) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
(2) |
| 2019 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
(6) |
Aug
(2) |
Sep
(4) |
Oct
|
Nov
|
Dec
(3) |
| 2021 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2022 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2024 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(30) |
Nov
|
Dec
(2) |
|
From: <ph...@lo...> - 2015-09-29 03:31:13
|
Can you note just change the font-size of the barcode field?
Phil
On 2015-09-28 08:19, Rafael Chacón wrote:
> Hi Ricard,
>
> I also use stockmaster.stockid=stockmaster.barcode (with 13 digits
> barcodes). I use two label sizes; the "for public label" is 50 x 100
> mm (american 2 x 4 inches). I prefer to use 5 cm length barcode (for
> 13 digits), but you can use a 3 cm length barcode (you can reduce the
> size of the barcode image and it still readable).
>
> Sorry, I use other software to print labels because I did not know
> this in webERP (I had no time to move from this other software to
> webERP, but I will do). Nicola Asuni's TCPDF has parameters for
> Width/Height of a single bar element in pixels (and put it in a cell +
> other elements like item name, etc.; you can preview it in HTML and
> then print in PDF --as generate a PDF from HTML--)
>
> The barcode reader is used to input the stock code in
> CounterSales.php/Item Code,
> SelectOrderItems.php?identifier=9999999999/OR Enter extract of the
> Stock Code:, etc. instead of type ("write by fingers").
>
> For me:
> + Pros: Everybody knows the stockmaster.stockid (except, obviously,
> the private barcodes --200 series--).
> - Cons: PDFPriceList.php sorts by "Item Code" instead of "Item
> Description" (and barcodes arr by manufacturer and by
> first-come-first-code).
>
> Best regards, Rafael.
>
> 2015-09-28 1:31 GMT-06:00 Pak Ricard <pak...@gm...>:
>
>> Hi all:
>>
>> On my struggle to print barcodes, etc... I face another problem. my
>> barcode field contains the same info as stockid (stockmaster.barcode
>> = stockmaster.stockid) and it's too long for the label :-(
>>
>> Question: Does webERP need that stockmaster.barcode =
>> stockmaster.stockid to use the barcode readers? Or webERP detects
>> when a barcode reader is used and selects the item by barcode field?
>> Or dies it by stockid?
>>
>> Example: CounterSales.php does not read/use the field
>> stockmaster.barcode. How does it identify the items? by stockid?
>>
>> Completely lost about this.
>>
>> Regards,
>> Ricard
>>
> ------------------------------------------------------------------------------
>>
>> _______________________________________________
>> Web-erp-developers mailing list
>> Web...@li...
>> https://lists.sourceforge.net/lists/listinfo/web-erp-developers [1]
>
>
>
> Links:
> ------
> [1] https://lists.sourceforge.net/lists/listinfo/web-erp-developers
>
> ------------------------------------------------------------------------------
>
> _______________________________________________
> Web-erp-developers mailing list
> Web...@li...
> https://lists.sourceforge.net/lists/listinfo/web-erp-developers
|
|
From: Rafael C. <raf...@gm...> - 2015-09-28 14:19:35
|
Hi Ricard,
I also use stockmaster.stockid=stockmaster.barcode (with 13 digits
barcodes). I use two label sizes; the "for public label" is 50 x 100 mm
(american 2 x 4 inches). I prefer to use 5 cm length barcode (for 13
digits), but you can use a 3 cm length barcode (you can reduce the size of
the barcode image and it still readable).
Sorry, I use other software to print labels because I did not know this in
webERP (I had no time to move from this other software to webERP, but I
will do). Nicola Asuni's TCPDF has parameters for Width/Height of a single
bar element in pixels (and put it in a cell + other elements like item
name, etc.; you can preview it in HTML and then print in PDF --as generate
a PDF from HTML--)
The barcode reader is used to input the stock code in CounterSales.php/Item
Code, SelectOrderItems.php?identifier=9999999999/OR Enter extract of the
Stock Code:, etc. instead of type ("write by fingers").
For me:
+ Pros: Everybody knows the stockmaster.stockid (except, obviously, the
private barcodes --200 series--).
- Cons: PDFPriceList.php sorts by "Item Code" instead of "Item Description"
(and barcodes arr by manufacturer and by first-come-first-code).
Best regards, Rafael.
2015-09-28 1:31 GMT-06:00 Pak Ricard <pak...@gm...>:
> Hi all:
>
> On my struggle to print barcodes, etc... I face another problem. my
> barcode field contains the same info as stockid (stockmaster.barcode =
> stockmaster.stockid) and it's too long for the label :-(
>
> Question: Does webERP need that stockmaster.barcode = stockmaster.stockid
> to use the barcode readers? Or webERP detects when a barcode reader is used
> and selects the item by barcode field? Or dies it by stockid?
>
> Example: CounterSales.php does not read/use the field stockmaster.barcode.
> How does it identify the items? by stockid?
>
> Completely lost about this.
>
>
>
> Regards,
> Ricard
>
>
> ------------------------------------------------------------------------------
>
> _______________________________________________
> Web-erp-developers mailing list
> Web...@li...
> https://lists.sourceforge.net/lists/listinfo/web-erp-developers
>
>
|
|
From: Pak R. <pak...@gm...> - 2015-09-28 07:32:34
|
Hi all: On my struggle to print barcodes, etc... I face another problem. my barcode field contains the same info as stockid (stockmaster.barcode = stockmaster.stockid) and it's too long for the label :-( Question: Does webERP need that stockmaster.barcode = stockmaster.stockid to use the barcode readers? Or webERP detects when a barcode reader is used and selects the item by barcode field? Or dies it by stockid? Example: CounterSales.php does not read/use the field stockmaster.barcode. How does it identify the items? by stockid? Completely lost about this. Regards, Ricard |
|
From: Pak R. <pak...@gm...> - 2015-09-28 04:16:14
|
Thanks Rafael: I will work it out :-) Regards, Ricard 2015-09-28 11:57 GMT+08:00 Rafael Chacón <raf...@gm...>: > Hi Ricard, > > I do not know. Nicola Asuni's TCPDF works fine. I worked with pdf to solve > a problem, and I tried to document. > > Best regards, Rafael. > El 27/09/2015 21:43, "Pak Ricard" <pak...@gm...> escribió: > >> Hi Rafael: >> >> Further checking with PDF creation in webERP and it seems webERP is using >> a modified version of TCPDF called CPDF (as I understand from class.pdf.php >> file). >> >> TCPDF has functionality to print barcodes TCPDF::write1DBarcode but it >> seems we have been using another library (barcodepack). Any specific >> reason? >> >> Thanks. >> >> >> >> Regards, >> Ricard >> >> 2015-09-22 0:36 GMT+08:00 Rafael Chacón <raf...@gm...>: >> >>> Hi Ricard, >>> >>> PDF, Nicola Asuni's TCPDF, R&OS's PHP Pdf Creation, and FPDF use >>> dot-per-inch (72 dpi = 1 inch). >>> >>> I do not know Labels.php and PDFPrintLabels.php scripts, but other >>> webERP scripts use dpi, not mm. >>> >>> I think the problem is that the code has changed from FPDF or >>> PHP_Pdf_Creation to TCPDF, but there are remnants of the old code. >>> Example of this is the height (Y pos): some code measure it from top, other >>> from bottom, and there are functions that do this conversion. Also, you can >>> NOT update TCPDF because there are compatibility problems (I tried this >>> last year). >>> >>> For standardisation, I think page and label measurements must be stored >>> in DB in dpi. But user interface could be different (user choice? mm, cm, >>> inch, dot, ...). >>> >>> Best regards, Rafael. >>> >>> >>> 2015-09-21 5:44 GMT-06:00 Pak Ricard <pak...@gm...>: >>> >>>> Hi Phil: >>>> >>>> I'm trying to make Labels.php and PDFPrintLabels.php work and I'm >>>> facing some issues. >>>> >>>> 1) Units in PDF points or mm? >>>> The title of the script states that all measurements are in PDF points, >>>> but line 11 onwards are meausrements in mm (A4 is 297 x 210 mm, as example). >>>> In PDFPrintLabels.php line 134 SELECT statement seems to transform DB >>>> fields in mm to PDF points >>>> In PDFPrintLabels.php line 164 and 165 seems to transform from mm to >>>> PDF points >>>> So not sure if page and label measurements must be done (and stored in >>>> DB) in mm or in PDF points. Looks like it's in mm, but title text and >>>> comments state differently. >>>> >>>> 2) Can't delete a field >>>> Also, in Labels.php, trying to delete a field shows an error: >>>> Not Acceptable! >>>> An appropriate representation of the requested resource could not be >>>> found on this server. This error was generated by Mod_Security. >>>> It's the first time I get this error message, so no clue what it meant. >>>> Are you using any specific library? >>>> >>>> 3) Problem positioning items >>>> I am creating a label with Code, price and barcode. It seems like the >>>> first field is properly positioned (stockid) but not price. Any combination >>>> tried does not position it correctly. Not sure what's wrong. I want Code >>>> and Price on the left half (code in top of the price) and barcode on the >>>> right half. There is no way to position price below stockid. >>>> >>>> Here is the definition of label I'm using and the desired position of >>>> fields (I supposed right measurements are in mm) >>>> >>>> INSERT INTO `labels` (`labelid`, `description`, `pagewidth`, >>>> `pageheight`, `height`, `width`, `topmargin`, `leftmargin`, `rowheight`, >>>> `columnwidth`) VALUES >>>> (2, 'Zetags T-570', 86.2, 10.2, 10, 86, 0.01, 0.01, 10.1, 86.1); >>>> >>>> INSERT INTO `labelfields` (`labelfieldid`, `labelid`, `fieldvalue`, >>>> `vpos`, `hpos`, `fontsize`, `barcode`) VALUES >>>> (4, 2, 'itemcode', 7, 1, 4, 0), >>>> (5, 2, 'price', 2, 1, 4, 0), >>>> (6, 2, 'barcode', 1, 43, 20, 1); >>>> >>>> >>>> Would be really appreciated if you could check it out. Thanks! >>>> >>>> >>>> Regards, >>>> Ricard >>>> >>>> >>>> ------------------------------------------------------------------------------ >>>> >>>> _______________________________________________ >>>> Web-erp-developers mailing list >>>> Web...@li... >>>> https://lists.sourceforge.net/lists/listinfo/web-erp-developers >>>> >>>> >>> >>> >>> ------------------------------------------------------------------------------ >>> >>> _______________________________________________ >>> Web-erp-developers mailing list >>> Web...@li... >>> https://lists.sourceforge.net/lists/listinfo/web-erp-developers >>> >>> >> >> >> ------------------------------------------------------------------------------ >> >> _______________________________________________ >> Web-erp-developers mailing list >> Web...@li... >> https://lists.sourceforge.net/lists/listinfo/web-erp-developers >> >> > > ------------------------------------------------------------------------------ > > _______________________________________________ > Web-erp-developers mailing list > Web...@li... > https://lists.sourceforge.net/lists/listinfo/web-erp-developers > > |
|
From: Rafael C. <raf...@gm...> - 2015-09-28 03:57:48
|
Hi Ricard, I do not know. Nicola Asuni's TCPDF works fine. I worked with pdf to solve a problem, and I tried to document. Best regards, Rafael. El 27/09/2015 21:43, "Pak Ricard" <pak...@gm...> escribió: > Hi Rafael: > > Further checking with PDF creation in webERP and it seems webERP is using > a modified version of TCPDF called CPDF (as I understand from class.pdf.php > file). > > TCPDF has functionality to print barcodes TCPDF::write1DBarcode but it > seems we have been using another library (barcodepack). Any specific > reason? > > Thanks. > > > > Regards, > Ricard > > 2015-09-22 0:36 GMT+08:00 Rafael Chacón <raf...@gm...>: > >> Hi Ricard, >> >> PDF, Nicola Asuni's TCPDF, R&OS's PHP Pdf Creation, and FPDF use >> dot-per-inch (72 dpi = 1 inch). >> >> I do not know Labels.php and PDFPrintLabels.php scripts, but other >> webERP scripts use dpi, not mm. >> >> I think the problem is that the code has changed from FPDF or >> PHP_Pdf_Creation to TCPDF, but there are remnants of the old code. >> Example of this is the height (Y pos): some code measure it from top, other >> from bottom, and there are functions that do this conversion. Also, you can >> NOT update TCPDF because there are compatibility problems (I tried this >> last year). >> >> For standardisation, I think page and label measurements must be stored >> in DB in dpi. But user interface could be different (user choice? mm, cm, >> inch, dot, ...). >> >> Best regards, Rafael. >> >> >> 2015-09-21 5:44 GMT-06:00 Pak Ricard <pak...@gm...>: >> >>> Hi Phil: >>> >>> I'm trying to make Labels.php and PDFPrintLabels.php work and I'm facing >>> some issues. >>> >>> 1) Units in PDF points or mm? >>> The title of the script states that all measurements are in PDF points, >>> but line 11 onwards are meausrements in mm (A4 is 297 x 210 mm, as example). >>> In PDFPrintLabels.php line 134 SELECT statement seems to transform DB >>> fields in mm to PDF points >>> In PDFPrintLabels.php line 164 and 165 seems to transform from mm to PDF >>> points >>> So not sure if page and label measurements must be done (and stored in >>> DB) in mm or in PDF points. Looks like it's in mm, but title text and >>> comments state differently. >>> >>> 2) Can't delete a field >>> Also, in Labels.php, trying to delete a field shows an error: >>> Not Acceptable! >>> An appropriate representation of the requested resource could not be >>> found on this server. This error was generated by Mod_Security. >>> It's the first time I get this error message, so no clue what it meant. >>> Are you using any specific library? >>> >>> 3) Problem positioning items >>> I am creating a label with Code, price and barcode. It seems like the >>> first field is properly positioned (stockid) but not price. Any combination >>> tried does not position it correctly. Not sure what's wrong. I want Code >>> and Price on the left half (code in top of the price) and barcode on the >>> right half. There is no way to position price below stockid. >>> >>> Here is the definition of label I'm using and the desired position of >>> fields (I supposed right measurements are in mm) >>> >>> INSERT INTO `labels` (`labelid`, `description`, `pagewidth`, >>> `pageheight`, `height`, `width`, `topmargin`, `leftmargin`, `rowheight`, >>> `columnwidth`) VALUES >>> (2, 'Zetags T-570', 86.2, 10.2, 10, 86, 0.01, 0.01, 10.1, 86.1); >>> >>> INSERT INTO `labelfields` (`labelfieldid`, `labelid`, `fieldvalue`, >>> `vpos`, `hpos`, `fontsize`, `barcode`) VALUES >>> (4, 2, 'itemcode', 7, 1, 4, 0), >>> (5, 2, 'price', 2, 1, 4, 0), >>> (6, 2, 'barcode', 1, 43, 20, 1); >>> >>> >>> Would be really appreciated if you could check it out. Thanks! >>> >>> >>> Regards, >>> Ricard >>> >>> >>> ------------------------------------------------------------------------------ >>> >>> _______________________________________________ >>> Web-erp-developers mailing list >>> Web...@li... >>> https://lists.sourceforge.net/lists/listinfo/web-erp-developers >>> >>> >> >> >> ------------------------------------------------------------------------------ >> >> _______________________________________________ >> Web-erp-developers mailing list >> Web...@li... >> https://lists.sourceforge.net/lists/listinfo/web-erp-developers >> >> > > > ------------------------------------------------------------------------------ > > _______________________________________________ > Web-erp-developers mailing list > Web...@li... > https://lists.sourceforge.net/lists/listinfo/web-erp-developers > > |
|
From: Pak R. <pak...@gm...> - 2015-09-28 03:42:37
|
Hi Rafael: Further checking with PDF creation in webERP and it seems webERP is using a modified version of TCPDF called CPDF (as I understand from class.pdf.php file). TCPDF has functionality to print barcodes TCPDF::write1DBarcode but it seems we have been using another library (barcodepack). Any specific reason? Thanks. Regards, Ricard 2015-09-22 0:36 GMT+08:00 Rafael Chacón <raf...@gm...>: > Hi Ricard, > > PDF, Nicola Asuni's TCPDF, R&OS's PHP Pdf Creation, and FPDF use > dot-per-inch (72 dpi = 1 inch). > > I do not know Labels.php and PDFPrintLabels.php scripts, but other webERP > scripts use dpi, not mm. > > I think the problem is that the code has changed from FPDF or > PHP_Pdf_Creation to TCPDF, but there are remnants of the old code. > Example of this is the height (Y pos): some code measure it from top, other > from bottom, and there are functions that do this conversion. Also, you can > NOT update TCPDF because there are compatibility problems (I tried this > last year). > > For standardisation, I think page and label measurements must be stored in > DB in dpi. But user interface could be different (user choice? mm, cm, > inch, dot, ...). > > Best regards, Rafael. > > > 2015-09-21 5:44 GMT-06:00 Pak Ricard <pak...@gm...>: > >> Hi Phil: >> >> I'm trying to make Labels.php and PDFPrintLabels.php work and I'm facing >> some issues. >> >> 1) Units in PDF points or mm? >> The title of the script states that all measurements are in PDF points, >> but line 11 onwards are meausrements in mm (A4 is 297 x 210 mm, as example). >> In PDFPrintLabels.php line 134 SELECT statement seems to transform DB >> fields in mm to PDF points >> In PDFPrintLabels.php line 164 and 165 seems to transform from mm to PDF >> points >> So not sure if page and label measurements must be done (and stored in >> DB) in mm or in PDF points. Looks like it's in mm, but title text and >> comments state differently. >> >> 2) Can't delete a field >> Also, in Labels.php, trying to delete a field shows an error: >> Not Acceptable! >> An appropriate representation of the requested resource could not be >> found on this server. This error was generated by Mod_Security. >> It's the first time I get this error message, so no clue what it meant. >> Are you using any specific library? >> >> 3) Problem positioning items >> I am creating a label with Code, price and barcode. It seems like the >> first field is properly positioned (stockid) but not price. Any combination >> tried does not position it correctly. Not sure what's wrong. I want Code >> and Price on the left half (code in top of the price) and barcode on the >> right half. There is no way to position price below stockid. >> >> Here is the definition of label I'm using and the desired position of >> fields (I supposed right measurements are in mm) >> >> INSERT INTO `labels` (`labelid`, `description`, `pagewidth`, >> `pageheight`, `height`, `width`, `topmargin`, `leftmargin`, `rowheight`, >> `columnwidth`) VALUES >> (2, 'Zetags T-570', 86.2, 10.2, 10, 86, 0.01, 0.01, 10.1, 86.1); >> >> INSERT INTO `labelfields` (`labelfieldid`, `labelid`, `fieldvalue`, >> `vpos`, `hpos`, `fontsize`, `barcode`) VALUES >> (4, 2, 'itemcode', 7, 1, 4, 0), >> (5, 2, 'price', 2, 1, 4, 0), >> (6, 2, 'barcode', 1, 43, 20, 1); >> >> >> Would be really appreciated if you could check it out. Thanks! >> >> >> Regards, >> Ricard >> >> >> ------------------------------------------------------------------------------ >> >> _______________________________________________ >> Web-erp-developers mailing list >> Web...@li... >> https://lists.sourceforge.net/lists/listinfo/web-erp-developers >> >> > > > ------------------------------------------------------------------------------ > > _______________________________________________ > Web-erp-developers mailing list > Web...@li... > https://lists.sourceforge.net/lists/listinfo/web-erp-developers > > |
|
From: Pak R. <pak...@gm...> - 2015-09-28 01:09:32
|
Thanks all for your comments: I just commited Labels.php and PDFPrintLabel.php with several fixes. Now it works. To be able to center, or right justify fields we should add a new table field (lenght) for every label field. Not done yet. The problem I face now, is I should create the PDF at 200 dpi, as the labels we want to use are really small and 72 dpi produce a barcode way too long. Label printer is 200 dpi so, I should use its full resolution. Any way to improve the resolution of the PDF file? Thanks in advance. Regards, Ricard 2015-09-22 4:00 GMT+08:00 Tim <tim...@bl...>: > I don't think this or all the other emails were meant for me you have the > wrong email address, please remove me from this list. > > Thank you > > Tim > > -----Original Message----- > From: Phil Daintree [mailto:ph...@lo...] > Sent: 21 September 2015 20:54 > To: webERP Developers > Subject: Re: [WebERP-developers] Doubts with labels and label printing > > Sorry it has been a long tim since that script and I can't recall off the > top of my head about the units used. I know the script was written long > after we ditched R & Os library pretty sure it was written using TCPDF but > no other library. I can't have done such a good job on this script sorry. > > Phil > Phil Daintree > +64 (0)275 567 890 > > > On 21/09/2015, at 11:44 pm, Pak Ricard <pak...@gm...> wrote: > > > > Hi Phil: > > > > I'm trying to make Labels.php and PDFPrintLabels.php work and I'm facing > some issues. > > > > 1) Units in PDF points or mm? > > The title of the script states that all measurements are in PDF points, > but line 11 onwards are meausrements in mm (A4 is 297 x 210 mm, as > example). > > In PDFPrintLabels.php line 134 SELECT statement seems to transform DB > fields in mm to PDF points > > In PDFPrintLabels.php line 164 and 165 seems to transform from mm to PDF > points > > So not sure if page and label measurements must be done (and stored in > DB) > in mm or in PDF points. Looks like it's in mm, but title text and comments > state differently. > > > > 2) Can't delete a field > > Also, in Labels.php, trying to delete a field shows an error: > > Not Acceptable! > > An appropriate representation of the requested resource could not be > found > on this server. This error was generated by Mod_Security. > > It's the first time I get this error message, so no clue what it meant. > Are you using any specific library? > > > > 3) Problem positioning items > > I am creating a label with Code, price and barcode. It seems like the > first field is properly positioned (stockid) but not price. Any combination > tried does not position it correctly. Not sure what's wrong. I want Code > and > Price on the left half (code in top of the price) and barcode on the right > half. There is no way to position price below stockid. > > > > Here is the definition of label I'm using and the desired position of > fields (I supposed right measurements are in mm) > > > > INSERT INTO `labels` (`labelid`, `description`, `pagewidth`, > `pageheight`, > `height`, `width`, `topmargin`, `leftmargin`, `rowheight`, `columnwidth`) > VALUES > > (2, 'Zetags T-570', 86.2, 10.2, 10, 86, 0.01, 0.01, 10.1, 86.1); > > > > INSERT INTO `labelfields` (`labelfieldid`, `labelid`, `fieldvalue`, > `vpos`, `hpos`, `fontsize`, `barcode`) VALUES > > (4, 2, 'itemcode', 7, 1, 4, 0), > > (5, 2, 'price', 2, 1, 4, 0), > > (6, 2, 'barcode', 1, 43, 20, 1); > > > > > > Would be really appreciated if you could check it out. Thanks! > > > > > > Regards, > > Ricard > > > > ---------------------------------------------------------------------------- > -- > > _______________________________________________ > > Web-erp-developers mailing list > > Web...@li... > > https://lists.sourceforge.net/lists/listinfo/web-erp-developers > > > ---------------------------------------------------------------------------- > -- > _______________________________________________ > Web-erp-developers mailing list > Web...@li... > https://lists.sourceforge.net/lists/listinfo/web-erp-developers > > > > ----- > No virus found in this message. > Checked by AVG - www.avg.com > Version: 2015.0.6140 / Virus Database: 4419/10677 - Release Date: 09/21/15 > > > > ------------------------------------------------------------------------------ > _______________________________________________ > Web-erp-developers mailing list > Web...@li... > https://lists.sourceforge.net/lists/listinfo/web-erp-developers > |
|
From: Tim <tim...@bl...> - 2015-09-21 20:00:24
|
I don't think this or all the other emails were meant for me you have the wrong email address, please remove me from this list. Thank you Tim -----Original Message----- From: Phil Daintree [mailto:ph...@lo...] Sent: 21 September 2015 20:54 To: webERP Developers Subject: Re: [WebERP-developers] Doubts with labels and label printing Sorry it has been a long tim since that script and I can't recall off the top of my head about the units used. I know the script was written long after we ditched R & Os library pretty sure it was written using TCPDF but no other library. I can't have done such a good job on this script sorry. Phil Phil Daintree +64 (0)275 567 890 > On 21/09/2015, at 11:44 pm, Pak Ricard <pak...@gm...> wrote: > > Hi Phil: > > I'm trying to make Labels.php and PDFPrintLabels.php work and I'm facing some issues. > > 1) Units in PDF points or mm? > The title of the script states that all measurements are in PDF points, but line 11 onwards are meausrements in mm (A4 is 297 x 210 mm, as example). > In PDFPrintLabels.php line 134 SELECT statement seems to transform DB fields in mm to PDF points > In PDFPrintLabels.php line 164 and 165 seems to transform from mm to PDF points > So not sure if page and label measurements must be done (and stored in DB) in mm or in PDF points. Looks like it's in mm, but title text and comments state differently. > > 2) Can't delete a field > Also, in Labels.php, trying to delete a field shows an error: > Not Acceptable! > An appropriate representation of the requested resource could not be found on this server. This error was generated by Mod_Security. > It's the first time I get this error message, so no clue what it meant. Are you using any specific library? > > 3) Problem positioning items > I am creating a label with Code, price and barcode. It seems like the first field is properly positioned (stockid) but not price. Any combination tried does not position it correctly. Not sure what's wrong. I want Code and Price on the left half (code in top of the price) and barcode on the right half. There is no way to position price below stockid. > > Here is the definition of label I'm using and the desired position of fields (I supposed right measurements are in mm) > > INSERT INTO `labels` (`labelid`, `description`, `pagewidth`, `pageheight`, `height`, `width`, `topmargin`, `leftmargin`, `rowheight`, `columnwidth`) VALUES > (2, 'Zetags T-570', 86.2, 10.2, 10, 86, 0.01, 0.01, 10.1, 86.1); > > INSERT INTO `labelfields` (`labelfieldid`, `labelid`, `fieldvalue`, `vpos`, `hpos`, `fontsize`, `barcode`) VALUES > (4, 2, 'itemcode', 7, 1, 4, 0), > (5, 2, 'price', 2, 1, 4, 0), > (6, 2, 'barcode', 1, 43, 20, 1); > > > Would be really appreciated if you could check it out. Thanks! > > > Regards, > Ricard > ---------------------------------------------------------------------------- -- > _______________________________________________ > Web-erp-developers mailing list > Web...@li... > https://lists.sourceforge.net/lists/listinfo/web-erp-developers ---------------------------------------------------------------------------- -- _______________________________________________ Web-erp-developers mailing list Web...@li... https://lists.sourceforge.net/lists/listinfo/web-erp-developers ----- No virus found in this message. Checked by AVG - www.avg.com Version: 2015.0.6140 / Virus Database: 4419/10677 - Release Date: 09/21/15 |
|
From: Phil D. <ph...@lo...> - 2015-09-21 19:54:16
|
Sorry it has been a long tim since that script and I can't recall off the top of my head about the units used. I know the script was written long after we ditched R & Os library pretty sure it was written using TCPDF but no other library. I can't have done such a good job on this script sorry. Phil Phil Daintree +64 (0)275 567 890 > On 21/09/2015, at 11:44 pm, Pak Ricard <pak...@gm...> wrote: > > Hi Phil: > > I'm trying to make Labels.php and PDFPrintLabels.php work and I'm facing some issues. > > 1) Units in PDF points or mm? > The title of the script states that all measurements are in PDF points, but line 11 onwards are meausrements in mm (A4 is 297 x 210 mm, as example). > In PDFPrintLabels.php line 134 SELECT statement seems to transform DB fields in mm to PDF points > In PDFPrintLabels.php line 164 and 165 seems to transform from mm to PDF points > So not sure if page and label measurements must be done (and stored in DB) in mm or in PDF points. Looks like it's in mm, but title text and comments state differently. > > 2) Can't delete a field > Also, in Labels.php, trying to delete a field shows an error: > Not Acceptable! > An appropriate representation of the requested resource could not be found on this server. This error was generated by Mod_Security. > It's the first time I get this error message, so no clue what it meant. Are you using any specific library? > > 3) Problem positioning items > I am creating a label with Code, price and barcode. It seems like the first field is properly positioned (stockid) but not price. Any combination tried does not position it correctly. Not sure what's wrong. I want Code and Price on the left half (code in top of the price) and barcode on the right half. There is no way to position price below stockid. > > Here is the definition of label I'm using and the desired position of fields (I supposed right measurements are in mm) > > INSERT INTO `labels` (`labelid`, `description`, `pagewidth`, `pageheight`, `height`, `width`, `topmargin`, `leftmargin`, `rowheight`, `columnwidth`) VALUES > (2, 'Zetags T-570', 86.2, 10.2, 10, 86, 0.01, 0.01, 10.1, 86.1); > > INSERT INTO `labelfields` (`labelfieldid`, `labelid`, `fieldvalue`, `vpos`, `hpos`, `fontsize`, `barcode`) VALUES > (4, 2, 'itemcode', 7, 1, 4, 0), > (5, 2, 'price', 2, 1, 4, 0), > (6, 2, 'barcode', 1, 43, 20, 1); > > > Would be really appreciated if you could check it out. Thanks! > > > Regards, > Ricard > ------------------------------------------------------------------------------ > _______________________________________________ > Web-erp-developers mailing list > Web...@li... > https://lists.sourceforge.net/lists/listinfo/web-erp-developers |
|
From: Andrew G. <aga...@re...> - 2015-09-21 18:28:05
|
Hello Ricard, You may want to take a look at PDFQALabel.php and also PDFFGLabel.php. The first integrates into P/O receiving and the second into W/O processing. You could make a local copy of the first program with your own formats and data fields for printing labels are P/O Receipt Time via a Goods Receipt. I am printing other information on them but Price and barcode are definitely possible. Labels can also be reprinted using “Reprint GRN” functionality. Best Regards, Andrew Galuski From: Rafael Chacón [mailto:raf...@gm...] Sent: Monday, September 21, 2015 11:36 AM To: webERP Developers Subject: Re: [WebERP-developers] Doubts with labels and label printing Hi Ricard, PDF, Nicola Asuni's TCPDF, R&OS's PHP Pdf Creation, and FPDF use dot-per-inch (72 dpi = 1 inch). I do not know Labels.php and PDFPrintLabels.php scripts, but other webERP scripts use dpi, not mm. I think the problem is that the code has changed from FPDF or PHP_Pdf_Creation to TCPDF, but there are remnants of the old code. Example of this is the height (Y pos): some code measure it from top, other from bottom, and there are functions that do this conversion. Also, you can NOT update TCPDF because there are compatibility problems (I tried this last year). For standardisation, I think page and label measurements must be stored in DB in dpi. But user interface could be different (user choice? mm, cm, inch, dot, ...). Best regards, Rafael. 2015-09-21 5:44 GMT-06:00 Pak Ricard <pak...@gm...<mailto:pak...@gm...>>: Hi Phil: I'm trying to make Labels.php and PDFPrintLabels.php work and I'm facing some issues. 1) Units in PDF points or mm? The title of the script states that all measurements are in PDF points, but line 11 onwards are meausrements in mm (A4 is 297 x 210 mm, as example). In PDFPrintLabels.php line 134 SELECT statement seems to transform DB fields in mm to PDF points In PDFPrintLabels.php line 164 and 165 seems to transform from mm to PDF points So not sure if page and label measurements must be done (and stored in DB) in mm or in PDF points. Looks like it's in mm, but title text and comments state differently. 2) Can't delete a field Also, in Labels.php, trying to delete a field shows an error: Not Acceptable! An appropriate representation of the requested resource could not be found on this server. This error was generated by Mod_Security. It's the first time I get this error message, so no clue what it meant. Are you using any specific library? 3) Problem positioning items I am creating a label with Code, price and barcode. It seems like the first field is properly positioned (stockid) but not price. Any combination tried does not position it correctly. Not sure what's wrong. I want Code and Price on the left half (code in top of the price) and barcode on the right half. There is no way to position price below stockid. Here is the definition of label I'm using and the desired position of fields (I supposed right measurements are in mm) INSERT INTO `labels` (`labelid`, `description`, `pagewidth`, `pageheight`, `height`, `width`, `topmargin`, `leftmargin`, `rowheight`, `columnwidth`) VALUES (2, 'Zetags T-570', 86.2, 10.2, 10, 86, 0.01, 0.01, 10.1, 86.1); INSERT INTO `labelfields` (`labelfieldid`, `labelid`, `fieldvalue`, `vpos`, `hpos`, `fontsize`, `barcode`) VALUES (4, 2, 'itemcode', 7, 1, 4, 0), (5, 2, 'price', 2, 1, 4, 0), (6, 2, 'barcode', 1, 43, 20, 1); Would be really appreciated if you could check it out. Thanks! Regards, Ricard ------------------------------------------------------------------------------ _______________________________________________ Web-erp-developers mailing list Web...@li...<mailto:Web...@li...> https://lists.sourceforge.net/lists/listinfo/web-erp-developers |
|
From: gilberto d. s. a. <gs...@gm...> - 2015-09-21 17:41:38
|
Very interesting! people make changes and do not make tests for that changes! For all of us be protect IMO allways one of us must be test to accept changes. How we could help for improve tests on weberp? 2015-09-21 13:36 GMT-03:00 Rafael Chacón <raf...@gm...>: > Hi Ricard, > > PDF, Nicola Asuni's TCPDF, R&OS's PHP Pdf Creation, and FPDF use > dot-per-inch (72 dpi = 1 inch). > > I do not know Labels.php and PDFPrintLabels.php scripts, but other webERP > scripts use dpi, not mm. > > I think the problem is that the code has changed from FPDF or > PHP_Pdf_Creation to TCPDF, but there are remnants of the old code. > Example of this is the height (Y pos): some code measure it from top, other > from bottom, and there are functions that do this conversion. Also, you can > NOT update TCPDF because there are compatibility problems (I tried this > last year). > > For standardisation, I think page and label measurements must be stored in > DB in dpi. But user interface could be different (user choice? mm, cm, > inch, dot, ...). > > Best regards, Rafael. > > > 2015-09-21 5:44 GMT-06:00 Pak Ricard <pak...@gm...>: > >> Hi Phil: >> >> I'm trying to make Labels.php and PDFPrintLabels.php work and I'm facing >> some issues. >> >> 1) Units in PDF points or mm? >> The title of the script states that all measurements are in PDF points, >> but line 11 onwards are meausrements in mm (A4 is 297 x 210 mm, as example). >> In PDFPrintLabels.php line 134 SELECT statement seems to transform DB >> fields in mm to PDF points >> In PDFPrintLabels.php line 164 and 165 seems to transform from mm to PDF >> points >> So not sure if page and label measurements must be done (and stored in >> DB) in mm or in PDF points. Looks like it's in mm, but title text and >> comments state differently. >> >> 2) Can't delete a field >> Also, in Labels.php, trying to delete a field shows an error: >> Not Acceptable! >> An appropriate representation of the requested resource could not be >> found on this server. This error was generated by Mod_Security. >> It's the first time I get this error message, so no clue what it meant. >> Are you using any specific library? >> >> 3) Problem positioning items >> I am creating a label with Code, price and barcode. It seems like the >> first field is properly positioned (stockid) but not price. Any combination >> tried does not position it correctly. Not sure what's wrong. I want Code >> and Price on the left half (code in top of the price) and barcode on the >> right half. There is no way to position price below stockid. >> >> Here is the definition of label I'm using and the desired position of >> fields (I supposed right measurements are in mm) >> >> INSERT INTO `labels` (`labelid`, `description`, `pagewidth`, >> `pageheight`, `height`, `width`, `topmargin`, `leftmargin`, `rowheight`, >> `columnwidth`) VALUES >> (2, 'Zetags T-570', 86.2, 10.2, 10, 86, 0.01, 0.01, 10.1, 86.1); >> >> INSERT INTO `labelfields` (`labelfieldid`, `labelid`, `fieldvalue`, >> `vpos`, `hpos`, `fontsize`, `barcode`) VALUES >> (4, 2, 'itemcode', 7, 1, 4, 0), >> (5, 2, 'price', 2, 1, 4, 0), >> (6, 2, 'barcode', 1, 43, 20, 1); >> >> >> Would be really appreciated if you could check it out. Thanks! >> >> >> Regards, >> Ricard >> >> >> ------------------------------------------------------------------------------ >> >> _______________________________________________ >> Web-erp-developers mailing list >> Web...@li... >> https://lists.sourceforge.net/lists/listinfo/web-erp-developers >> >> > > > ------------------------------------------------------------------------------ > > _______________________________________________ > Web-erp-developers mailing list > Web...@li... > https://lists.sourceforge.net/lists/listinfo/web-erp-developers > > -- gilberto dos santos alves +55(11)9-8646-5049 sao paulo - sp - brasil |
|
From: Rafael C. <raf...@gm...> - 2015-09-21 16:36:33
|
Hi Ricard, PDF, Nicola Asuni's TCPDF, R&OS's PHP Pdf Creation, and FPDF use dot-per-inch (72 dpi = 1 inch). I do not know Labels.php and PDFPrintLabels.php scripts, but other webERP scripts use dpi, not mm. I think the problem is that the code has changed from FPDF or PHP_Pdf_Creation to TCPDF, but there are remnants of the old code. Example of this is the height (Y pos): some code measure it from top, other from bottom, and there are functions that do this conversion. Also, you can NOT update TCPDF because there are compatibility problems (I tried this last year). For standardisation, I think page and label measurements must be stored in DB in dpi. But user interface could be different (user choice? mm, cm, inch, dot, ...). Best regards, Rafael. 2015-09-21 5:44 GMT-06:00 Pak Ricard <pak...@gm...>: > Hi Phil: > > I'm trying to make Labels.php and PDFPrintLabels.php work and I'm facing > some issues. > > 1) Units in PDF points or mm? > The title of the script states that all measurements are in PDF points, > but line 11 onwards are meausrements in mm (A4 is 297 x 210 mm, as example). > In PDFPrintLabels.php line 134 SELECT statement seems to transform DB > fields in mm to PDF points > In PDFPrintLabels.php line 164 and 165 seems to transform from mm to PDF > points > So not sure if page and label measurements must be done (and stored in DB) > in mm or in PDF points. Looks like it's in mm, but title text and comments > state differently. > > 2) Can't delete a field > Also, in Labels.php, trying to delete a field shows an error: > Not Acceptable! > An appropriate representation of the requested resource could not be found > on this server. This error was generated by Mod_Security. > It's the first time I get this error message, so no clue what it meant. > Are you using any specific library? > > 3) Problem positioning items > I am creating a label with Code, price and barcode. It seems like the > first field is properly positioned (stockid) but not price. Any combination > tried does not position it correctly. Not sure what's wrong. I want Code > and Price on the left half (code in top of the price) and barcode on the > right half. There is no way to position price below stockid. > > Here is the definition of label I'm using and the desired position of > fields (I supposed right measurements are in mm) > > INSERT INTO `labels` (`labelid`, `description`, `pagewidth`, `pageheight`, > `height`, `width`, `topmargin`, `leftmargin`, `rowheight`, `columnwidth`) > VALUES > (2, 'Zetags T-570', 86.2, 10.2, 10, 86, 0.01, 0.01, 10.1, 86.1); > > INSERT INTO `labelfields` (`labelfieldid`, `labelid`, `fieldvalue`, > `vpos`, `hpos`, `fontsize`, `barcode`) VALUES > (4, 2, 'itemcode', 7, 1, 4, 0), > (5, 2, 'price', 2, 1, 4, 0), > (6, 2, 'barcode', 1, 43, 20, 1); > > > Would be really appreciated if you could check it out. Thanks! > > > Regards, > Ricard > > > ------------------------------------------------------------------------------ > > _______________________________________________ > Web-erp-developers mailing list > Web...@li... > https://lists.sourceforge.net/lists/listinfo/web-erp-developers > > |
|
From: Pak R. <pak...@gm...> - 2015-09-21 11:45:27
|
Hi Phil: I'm trying to make Labels.php and PDFPrintLabels.php work and I'm facing some issues. 1) Units in PDF points or mm? The title of the script states that all measurements are in PDF points, but line 11 onwards are meausrements in mm (A4 is 297 x 210 mm, as example). In PDFPrintLabels.php line 134 SELECT statement seems to transform DB fields in mm to PDF points In PDFPrintLabels.php line 164 and 165 seems to transform from mm to PDF points So not sure if page and label measurements must be done (and stored in DB) in mm or in PDF points. Looks like it's in mm, but title text and comments state differently. 2) Can't delete a field Also, in Labels.php, trying to delete a field shows an error: Not Acceptable! An appropriate representation of the requested resource could not be found on this server. This error was generated by Mod_Security. It's the first time I get this error message, so no clue what it meant. Are you using any specific library? 3) Problem positioning items I am creating a label with Code, price and barcode. It seems like the first field is properly positioned (stockid) but not price. Any combination tried does not position it correctly. Not sure what's wrong. I want Code and Price on the left half (code in top of the price) and barcode on the right half. There is no way to position price below stockid. Here is the definition of label I'm using and the desired position of fields (I supposed right measurements are in mm) INSERT INTO `labels` (`labelid`, `description`, `pagewidth`, `pageheight`, `height`, `width`, `topmargin`, `leftmargin`, `rowheight`, `columnwidth`) VALUES (2, 'Zetags T-570', 86.2, 10.2, 10, 86, 0.01, 0.01, 10.1, 86.1); INSERT INTO `labelfields` (`labelfieldid`, `labelid`, `fieldvalue`, `vpos`, `hpos`, `fontsize`, `barcode`) VALUES (4, 2, 'itemcode', 7, 1, 4, 0), (5, 2, 'price', 2, 1, 4, 0), (6, 2, 'barcode', 1, 43, 20, 1); Would be really appreciated if you could check it out. Thanks! Regards, Ricard |
|
From: ExsonQu <hex...@gm...> - 2015-09-21 02:05:47
|
*Hi, Phil,*
Thank you for your confirmation. I've commit the fix to the
trunk.
And thank you very much for Akits' report. And sorry for the
late to check it.
Best regards!
Exson
--
View this message in context: http://weberp-accounting.1478800.n4.nabble.com/Is-the-write-off-variance-correctly-defined-in-suppliers-invoice-tp4658329p4658333.html
Sent from the web-ERP-developers mailing list archive at Nabble.com.
|
|
From: <ph...@lo...> - 2015-09-21 01:47:15
|
Yes of course this is correct Exson... when it is a supplier credit note (a debit note) then a positive variance needs to be deducted. Good spot! Sorry bout that. Phil On 2015-09-20 08:23, ExsonQu wrote: > *Hi, Phil,* > > Thank you for your quick reply. > > I'll prepare a test case to show it clear later. > > And I received a bug report from Akits monthes ago about the > SupplierCredit.php. The cost update seems add at the wrong direction: > $PurchPriceVar = $EnteredGRN->This_QuantityInv * > (($EnteredGRN->ChgPrice /$_SESSION['SuppTrans']->ExRate) - > $EnteredGRN->StdCostUnit); > $CostIncrement = ($PurchPriceVar - $WriteOffToVariances) / > $TotalQuantityOnHand; > > $sql = "UPDATE stockmaster SET > lastcost=materialcost+overheadcost+labourcost, > materialcost=materialcost+" . $CostIncrement . " > WHERE stockid='" . $EnteredGRN->ItemCode . "'"; > If the PurchPriceVar is positive, when we issue a Credit > Note, > then the material cost should become lower. But above update SQL will > make > it become higher. > Following is the actual data: > Initial inventory: 176 standcost 50 > #1 (Inv 43) 10kg // $ 51.5 // cost: 50.08 > #2 (Inv 44) 5kg // $ 52.32 // cost: 50.14 > #3 (Inv 45) 20kg // $ 52.15 // cost: 50.33 > #4 (Inv 46) 8kg // $ 53.05 // cost: 50.43 > A credit invoice to reverse #2, then the PurchPriceVar is > (52.323-50.08)*5=2.24*5=11.2 > 11.2/219 = 0.051. Then the new material cost should be 50.43 > - > 0.051=50.379. > Unfortunately, current calculation result is 50.43+0.051 = > 50.481. > Please confirm it and thank you again Phil. > > Best regards! > > Exson > > > > > > > > -- > View this message in context: > http://weberp-accounting.1478800.n4.nabble.com/Is-the-write-off-variance-correctly-defined-in-suppliers-invoice-tp4658329p4658331.html > Sent from the web-ERP-developers mailing list archive at Nabble.com. > > ------------------------------------------------------------------------------ > _______________________________________________ > Web-erp-developers mailing list > Web...@li... > https://lists.sourceforge.net/lists/listinfo/web-erp-developers |
|
From: ExsonQu <hex...@gm...> - 2015-09-20 14:31:06
|
*Hi, Phil,*
Thank you for your quick reply.
I'll prepare a test case to show it clear later.
And I received a bug report from Akits monthes ago about the
SupplierCredit.php. The cost update seems add at the wrong direction:
$PurchPriceVar = $EnteredGRN->This_QuantityInv *
(($EnteredGRN->ChgPrice /$_SESSION['SuppTrans']->ExRate) -
$EnteredGRN->StdCostUnit);
$CostIncrement = ($PurchPriceVar - $WriteOffToVariances) /
$TotalQuantityOnHand;
$sql = "UPDATE stockmaster SET
lastcost=materialcost+overheadcost+labourcost,
materialcost=materialcost+" . $CostIncrement . "
WHERE stockid='" . $EnteredGRN->ItemCode . "'";
If the PurchPriceVar is positive, when we issue a Credit Note,
then the material cost should become lower. But above update SQL will make
it become higher.
Following is the actual data:
Initial inventory: 176 standcost 50
#1 (Inv 43) 10kg // $ 51.5 // cost: 50.08
#2 (Inv 44) 5kg // $ 52.32 // cost: 50.14
#3 (Inv 45) 20kg // $ 52.15 // cost: 50.33
#4 (Inv 46) 8kg // $ 53.05 // cost: 50.43
A credit invoice to reverse #2, then the PurchPriceVar is
(52.323-50.08)*5=2.24*5=11.2
11.2/219 = 0.051. Then the new material cost should be 50.43 -
0.051=50.379.
Unfortunately, current calculation result is 50.43+0.051 = 50.481.
Please confirm it and thank you again Phil.
Best regards!
Exson
--
View this message in context: http://weberp-accounting.1478800.n4.nabble.com/Is-the-write-off-variance-correctly-defined-in-suppliers-invoice-tp4658329p4658331.html
Sent from the web-ERP-developers mailing list archive at Nabble.com.
|
|
From: Phil D. <ph...@lo...> - 2015-09-20 09:39:49
|
You might have to flesh this out a bit Exson... not sure I fully understand. I think it is right to base the GL posting date using the date of the invoice - if the "prohibit GL postings to periods before" system parameter is set to a period after the period identified by looking at the invoice date then the GL posting will occur in the first period following the "prohibit GL postings to periods before" system parameter. I don't think the input date has much to do with the GL posting. Using the weighted average costing - the quantity on hand at the time at the time the invoice is posted is required to identify the number of items that the variance needs to be averaged over. There is no retrospective costing going on or possible. Phil Phil Daintree Logic Works Ltd - +64 (0)275 567890 http://www.logicworks.co.nz On 20/09/15 20:45, ExsonQu wrote: > *Dear all,* > > Thank you for your long time efforts to webERP. > > When I studied the suppliers invoice scripts, I found that the > WriteOffVariance is based on Current Quantity On Hand (The supplier's > *invoice input date*): > > ($EnteredGRN->This_QuantityInv - $TotalQuantityOnHand) * > (($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - > $EnteredGRN->StdCostUnit); > The TotalQuantityOnHand is from following sql: > $sql ="SELECT SUM(quantity) FROM locstock WHERE stockid='" . > $EnteredGRN->ItemCode . "'"; > But the Period GL posted is up to the *invoice date* input by > users. > I think it make sense if suppliers' *invoice date* and *input > date* within the same period. > But does it still make sense if the *input date* and *invoice > date *are not within the same period? Need we change it to the historical > (invoice date) QOH? > > Any comments are highly appreciated! > > Thanks and best regards! > > Exson > > > > > > > > -- > View this message in context: http://weberp-accounting.1478800.n4.nabble.com/Is-the-write-off-variance-correctly-defined-in-suppliers-invoice-tp4658329.html > Sent from the web-ERP-developers mailing list archive at Nabble.com. > > ------------------------------------------------------------------------------ > _______________________________________________ > Web-erp-developers mailing list > Web...@li... > https://lists.sourceforge.net/lists/listinfo/web-erp-developers > |
|
From: ExsonQu <hex...@gm...> - 2015-09-20 08:53:37
|
*Dear all,*
Thank you for your long time efforts to webERP.
When I studied the suppliers invoice scripts, I found that the
WriteOffVariance is based on Current Quantity On Hand (The supplier's
*invoice input date*):
($EnteredGRN->This_QuantityInv - $TotalQuantityOnHand) *
(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) -
$EnteredGRN->StdCostUnit);
The TotalQuantityOnHand is from following sql:
$sql ="SELECT SUM(quantity) FROM locstock WHERE stockid='" .
$EnteredGRN->ItemCode . "'";
But the Period GL posted is up to the *invoice date* input by
users.
I think it make sense if suppliers' *invoice date* and *input
date* within the same period.
But does it still make sense if the *input date* and *invoice
date *are not within the same period? Need we change it to the historical
(invoice date) QOH?
Any comments are highly appreciated!
Thanks and best regards!
Exson
--
View this message in context: http://weberp-accounting.1478800.n4.nabble.com/Is-the-write-off-variance-correctly-defined-in-suppliers-invoice-tp4658329.html
Sent from the web-ERP-developers mailing list archive at Nabble.com.
|
|
From: Rafael C. <raf...@gm...> - 2015-09-17 13:15:48
|
Hi,
Example of code:
echo '<br />
<table class="selection">
<thead>
<tr>
<th class="ascending number">', _('Section Number'), '</th>
<th class="ascending text">', _('Section Description'), '</th>
<th class="noprint" colspan="2"> </th>
</tr>
</thead>
<tbody>';
New in code:
+ Tags: <thead>; </thead><tbody>.
+ Classes: number; centre; text.
Those tags and classes are useful when formatting for printing output
(using print.css).
Best regards, Rafael.
2015-09-15 2:39 GMT-06:00 Phil Daintree <ph...@lo...>:
> I prefer 2 personally
>
> Phil
>
> Phil Daintree
> Logic Works Ltd - +64 (0)275 567890http://www.logicworks.co.nz
>
> On 15/09/15 01:51, Rafael Chacón wrote:
>
> Hi Tim,
>
> Yes, I agree with you. I am looking for a "collegiate" compromise to
> standardise the code. We have two options:
> 1. A javascript code that considers html code with/without formats. Cons:
> more complicated, more execution time. Pros: prevents risk of
> unstandardised code.
> 2. A javascript code that do not consider html code with/without formats.
> Pros: less complicated, less execution time. Cons: risk of malfunction if
> someone uses unstandardised code.
>
> Best regards, Rafael.
>
>
> ---------- Forwarded message ----------
> From: Tim Schofield <tim...@gm...>
> Date: 2015-09-13 12:26 GMT-06:00
> Subject: Re: [WebERP-developers] Table sort javascript routine
> To: Rafael Emilio Chacon <raf...@gm...>
>
>
> Hi Rafael
>
> I am travelling and not in a position to give a detailed response until
> Friday at the earliest.
>
> However it is easily resolved if we standardise on the format of tables we
> want sorted. That is if all the tables we want sorting had thead and tbody
> sections it can be done.
>
> Thanks
> Tim
>
> Course View Towers,
> Plot 21 Yusuf Lule Road,
> Kampala
> T +256 (0) 312 314 418
> M +256 (0) 752 963 325
> www.weberpafrica.com
> Twitter: @TimSchofield2
> Blog: http://weberpafrica.blogspot.co.uk
> On 13 Sep 2015 20:39, "Rafael Chacón" <raf...@gm...>
> wrote:
>
>> Hi,
>>
>> In this moment, we can not use a sortable table with <thead>, <tbody> and
>> <tfoot>. Also, we can not use the classes "number", "centre" and "text"
>> with class="ascending" without messing up the table sort javascript routine.
>>
>> It is pending to fix this.
>>
>> Best regards, Rafael.
>>
>>
>> ---------- Forwarded message ----------
>> From: <rc...@us...>
>> Date: 2015-09-13 11:21 GMT-06:00
>> Subject: [Web-erp-svn] SF.net SVN: web-erp:[7348] trunk
>> To: web...@li...
>>
>>
>> Revision: 7348
>> http://sourceforge.net/p/web-erp/reponame/7348
>> Author: rchacon
>> Date: 2015-09-13 17:21:49 +0000 (Sun, 13 Sep 2015)
>> Log Message:
>> -----------
>> In AccountSections.php, add modifications for direct printing.
>>
>> Modified Paths:
>> --------------
>> trunk/AccountSections.php
>> trunk/doc/Change.log
>>
>> Modified: trunk/AccountSections.php
>> ===================================================================
>> --- trunk/AccountSections.php 2015-09-05 22:20:44 UTC (rev 7347)
>> +++ trunk/AccountSections.php 2015-09-13 17:21:49 UTC (rev 7348)
>> @@ -1,11 +1,11 @@
>> <?php
>> /* $Id$*/
>> +/* Defines the sections in the general ledger reports. */
>>
>> include('includes/session.inc');
>> $Title = _('Account Sections');
>> -/* Manual links before header.inc */
>> -$ViewTopic = 'GeneralLedger';// Filename in ManualContents.php's TOC.
>> -$BookMark = 'AccountSections';// Anchor's id in the manual's html
>> document.
>> +$ViewTopic = 'GeneralLedger';
>> +$BookMark = 'AccountSections';
>> include('includes/header.inc');
>>
>> // SOME TEST TO ENSURE THAT AT LEAST INCOME AND COST OF SALES ARE THERE
>> @@ -33,13 +33,13 @@
>> // DONE WITH MINIMUM TESTS
>>
>>
>> -if (isset($Errors)) {
>> +if(isset($Errors)) {
>> unset($Errors);
>> }
>>
>> $Errors = array();
>>
>> -if (isset($_POST['submit'])) {
>> +if(isset($_POST['submit'])) {
>>
>> //initialise no input errors assumed initially before we test
>>
>> @@ -50,45 +50,45 @@
>> ie the page has called itself with some user input */
>>
>> //first off validate inputs sensible
>> - if (isset($_POST['SectionID'])) {
>> + if(isset($_POST['SectionID'])) {
>> $sql="SELECT sectionid
>> FROM accountsection
>> WHERE
>> sectionid='".$_POST['SectionID']."'";
>> $result=DB_query($sql);
>>
>> - if ((DB_num_rows($result)!=0 AND
>> !isset($_POST['SelectedSectionID']))) {
>> + if((DB_num_rows($result)!=0 AND
>> !isset($_POST['SelectedSectionID']))) {
>> $InputError = 1;
>> prnMsg( _('The account section already exists in
>> the database'),'error');
>> $Errors[$i] = 'SectionID';
>> $i++;
>> }
>> }
>> - if (ContainsIllegalCharacters($_POST['SectionName'])) {
>> + if(ContainsIllegalCharacters($_POST['SectionName'])) {
>> $InputError = 1;
>> prnMsg( _('The account section name cannot contain any
>> illegal characters') ,'error');
>> $Errors[$i] = 'SectionName';
>> $i++;
>> }
>> - if (mb_strlen($_POST['SectionName'])==0) {
>> + if(mb_strlen($_POST['SectionName'])==0) {
>> $InputError = 1;
>> prnMsg( _('The account section name must contain at least
>> one character') ,'error');
>> $Errors[$i] = 'SectionName';
>> $i++;
>> }
>> - if (isset($_POST['SectionID']) AND
>> (!is_numeric($_POST['SectionID']))) {
>> + if(isset($_POST['SectionID']) AND
>> (!is_numeric($_POST['SectionID']))) {
>> $InputError = 1;
>> prnMsg( _('The section number must be an
>> integer'),'error');
>> $Errors[$i] = 'SectionID';
>> $i++;
>> }
>> - if (isset($_POST['SectionID']) AND
>> mb_strpos($_POST['SectionID'],".")>0) {
>> + if(isset($_POST['SectionID']) AND
>> mb_strpos($_POST['SectionID'],".")>0) {
>> $InputError = 1;
>> prnMsg( _('The section number must be an
>> integer'),'error');
>> $Errors[$i] = 'SectionID';
>> $i++;
>> }
>>
>> - if (isset($_POST['SelectedSectionID']) AND
>> $_POST['SelectedSectionID']!='' AND $InputError !=1) {
>> + if(isset($_POST['SelectedSectionID']) AND
>> $_POST['SelectedSectionID']!='' AND $InputError !=1) {
>>
>> /*SelectedSectionID could also exist if submit had not
>> been clicked this code would not run in this case cos submit is false of
>> course see the delete code below*/
>>
>> @@ -96,7 +96,7 @@
>> WHERE sectionid = '" .
>> $_POST['SelectedSectionID'] . "'";
>>
>> $msg = _('Record Updated');
>> - } elseif ($InputError !=1) {
>> + } elseif($InputError !=1) {
>>
>> /*SelectedSectionID is null cos no item selected on first time
>> round so must be adding a record must be submitting new entries in the new
>> account section form */
>>
>> @@ -108,7 +108,7 @@
>> $msg = _('Record inserted');
>> }
>>
>> - if ($InputError!=1){
>> + if($InputError!=1) {
>> //run the SQL from either of the above possibilites
>> $result = DB_query($sql);
>> prnMsg($msg,'success');
>> @@ -117,14 +117,14 @@
>> unset ($_POST['SectionName']);
>> }
>>
>> -} elseif (isset($_GET['delete'])) {
>> +} elseif(isset($_GET['delete'])) {
>> //the link to delete a selected record was clicked instead of the submit
>> button
>>
>> // PREVENT DELETES IF DEPENDENT RECORDS IN 'accountgroups'
>> $sql= "SELECT COUNT(sectioninaccounts) AS sections FROM
>> accountgroups WHERE sectioninaccounts='" . $_GET['SelectedSectionID'] . "'";
>> $result = DB_query($sql);
>> $myrow = DB_fetch_array($result);
>> - if ($myrow['sections']>0) {
>> + if($myrow['sections']>0) {
>> prnMsg( _('Cannot delete this account section because
>> general ledger accounts groups have been created using this
>> section'),'warn');
>> echo '<div>';
>> echo '<br />' . _('There are') . ' ' . $myrow['sections']
>> . ' ' . _('general ledger accounts groups that refer to this account
>> section');
>> @@ -149,7 +149,7 @@
>> unset ($_POST['SectionName']);
>> }
>>
>> -if (!isset($_GET['SelectedSectionID']) AND
>> !isset($_POST['SelectedSectionID'])) {
>> +if(!isset($_GET['SelectedSectionID']) AND
>> !isset($_POST['SelectedSectionID'])) {
>>
>> /* An account section could be posted when one has been edited and is
>> being updated
>> or GOT when selected for modification
>> @@ -166,19 +166,24 @@
>>
>> $ErrMsg = _('Could not get account group sections because');
>> $result = DB_query($sql,$ErrMsg);
>> - echo '<p class="page_title_text"><img alt=""
>> src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' .
>> _('Search') . '" />' . ' ' . $Title . '</p><br />';
>> +/* echo '<div id="Report">';// Division to identify the report
>> block.*/
>> + echo '<p class="page_title_text"><img alt="" class="noprint"
>> src="', $RootPath, '/css/', $Theme,
>> + '/images/maintenance.png" title="', // Icon image.
>> + _('Account Sections'), '" /> ', // Icon title.
>> + _('Account Sections'), '</p>';// Page title.
>>
>> - echo '<table class="selection">
>> + echo '<br />
>> + <table class="selection">
>> <tr>
>> - <th class="ascending">' . _('Section
>> Number') . '</th>
>> - <th class="ascending">' . _('Section
>> Description') . '</th>
>> - <th colspan="2"> </th>
>> + <th class="ascending">', _('Section
>> Number'), '</th>
>> + <th class="ascending">', _('Section
>> Description'), '</th>
>> + <th class="noprint"
>> colspan="2"> </th>
>> </tr>';
>>
>> $k=0; //row colour counter
>> while ($myrow = DB_fetch_array($result)) {
>>
>> - if ($k==1){
>> + if($k==1) {
>> echo '<tr class="EvenTableRows">';
>> $k=0;
>> } else {
>> @@ -186,31 +191,32 @@
>> $k++;
>> }
>>
>> - echo '<td class="number">' . $myrow['sectionid'] . '</td>
>> - <td>' . $myrow['sectionname'] . '</td>
>> - <td><a href="' .
>> htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedSectionID=' .
>> urlencode($myrow['sectionid']), ENT_QUOTES, 'UTF-8') . '">' . _('Edit') .
>> '</a></td>';
>> - if ( $myrow['sectionid'] == '1' or $myrow['sectionid'] ==
>> '2' ) {
>> - echo '<td><b>' . _('Restricted') . '</b></td>';
>> + echo '<td class="number">', $myrow['sectionid'], '</td>
>> + <td class="text">',
>> $myrow['sectionname'], '</td>
>> + <td class="noprint"><a href="',
>> htmlspecialchars($_SERVER['PHP_SELF'], '?SelectedSectionID=',
>> urlencode($myrow['sectionid']), ENT_QUOTES, 'UTF-8'), '">', _('Edit'),
>> '</a></td>';
>> + if( $myrow['sectionid'] == '1' or $myrow['sectionid'] ==
>> '2' ) {
>> + echo '<td class="noprint"><b>', _('Restricted'),
>> '</b></td>';
>> } else {
>> - echo '<td><a href="' .
>> htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedSectionID=' .
>> urlencode($myrow['sectionid']) . '&delete=1', ENT_QUOTES, 'UTF-8') . '">' .
>> _('Delete') . '</a></td>';
>> + echo '<td class="noprint"><a href="',
>> htmlspecialchars($_SERVER['PHP_SELF'], '?SelectedSectionID=',
>> urlencode($myrow['sectionid']), '&delete=1', ENT_QUOTES, 'UTF-8'), '">',
>> _('Delete'), '</a></td>';
>> }
>> echo '</tr>';
>> } //END WHILE LIST LOOP
>> echo '</table>';
>> +/* echo '</div>';// End div id="Report".*/
>> } //end of ifs and buts!
>>
>>
>> -if (isset($_POST['SelectedSectionID']) or
>> isset($_GET['SelectedSectionID'])) {
>> +if(isset($_POST['SelectedSectionID']) or
>> isset($_GET['SelectedSectionID'])) {
>> echo '<div class="centre"><a href="' .
>> htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' .
>> _('Review Account Sections') . '</a></div>';
>> }
>>
>> -if (! isset($_GET['delete'])) {
>> +if(! isset($_GET['delete'])) {
>>
>> - echo '<form method="post" id="AccountSections" action="' .
>> htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
>> - echo '<div><br />';
>> - echo '<input type="hidden" name="FormID" value="' .
>> $_SESSION['FormID'] . '" />';
>> + echo '<form action="', htmlspecialchars($_SERVER['PHP_SELF'],
>> ENT_QUOTES, 'UTF-8'), '" id="AccountSections" method="post">';
>> + echo '<div class="noprint"><br />';
>> + echo '<input name="FormID" type="hidden" value="',
>> $_SESSION['FormID'], '" />';
>>
>> - if (isset($_GET['SelectedSectionID'])) {
>> + if(isset($_GET['SelectedSectionID'])) {
>> //editing an existing section
>>
>> $sql = "SELECT sectionid,
>> @@ -219,7 +225,7 @@
>> WHERE sectionid='" . $_GET['SelectedSectionID']
>> ."'";
>>
>> $result = DB_query($sql);
>> - if ( DB_num_rows($result) == 0 ) {
>> + if( DB_num_rows($result) == 0 ) {
>> prnMsg( _('Could not retrieve the requested
>> section please try again.'),'warn');
>> unset($_GET['SelectedSectionID']);
>> } else {
>> @@ -238,13 +244,13 @@
>>
>> } else {
>>
>> - if (!isset($_POST['SelectedSectionID'])){
>> + if(!isset($_POST['SelectedSectionID'])) {
>> $_POST['SelectedSectionID']='';
>> }
>> - if (!isset($_POST['SectionID'])){
>> + if(!isset($_POST['SectionID'])) {
>> $_POST['SectionID']='';
>> }
>> - if (!isset($_POST['SectionName'])) {
>> + if(!isset($_POST['SectionName'])) {
>> $_POST['SectionName']='';
>> }
>> echo '<table class="selection">
>>
>> Modified: trunk/doc/Change.log
>> ===================================================================
>> --- trunk/doc/Change.log 2015-09-05 22:20:44 UTC (rev 7347)
>> +++ trunk/doc/Change.log 2015-09-13 17:21:49 UTC (rev 7348)
>> @@ -1,5 +1,6 @@
>> webERP Change Log
>>
>> +13/9/15 RChacon: In AccountSections.php, add modifications for direct
>> printing.
>> 4/9/15 Wes Wolfenbarger: Fix to Z_ImportStocks.php added quotes to
>> descriptions - also fixes error message when the csv does not match the
>> template
>> 27/08/15 Exson: Fixed the allocation status of involved invoice and
>> credit notes in Credit_Invoice.php.
>> 19/08/15 RChacon: In AnalysisHorizontalIncome.php, delete variable
>> $period because it is not used anywhere (thanks Tim). Extract header.inc
>> from if.
>>
>>
>>
>> ------------------------------------------------------------------------------
>> _______________________________________________
>> Web-erp-svn mailing list
>> Web...@li...
>> https://lists.sourceforge.net/lists/listinfo/web-erp-svn
>>
>>
>>
>> ------------------------------------------------------------------------------
>>
>> _______________________________________________
>> Web-erp-developers mailing list
>> Web...@li...
>> https://lists.sourceforge.net/lists/listinfo/web-erp-developers
>>
>>
>
>
> ------------------------------------------------------------------------------
>
>
>
> _______________________________________________
> Web-erp-developers mailing lis...@li...https://lists.sourceforge.net/lists/listinfo/web-erp-developers
>
>
>
>
> ------------------------------------------------------------------------------
>
> _______________________________________________
> Web-erp-developers mailing list
> Web...@li...
> https://lists.sourceforge.net/lists/listinfo/web-erp-developers
>
>
|
|
From: Arwan <r1g...@gm...> - 2015-09-16 15:44:40
|
Hi, When I use Z_ChangeStockCode.php to change the item code of controlled and serialized stock items, the process seems to work fine but it de-activates the field serialized (makes it 0 instead of 1) i.e in the old stock item the field controlled and serialized are both set to yes / yes after running Z_ChangeStockCode.php the fields controlled and serialized are set to yes / No The field serialized was missing in the INSERT statement of Z_ChangeStockCode.php but even when I add it, it still does not work as expected. Thanks in advance Aewan ----- WebTech Resources Nairobi Kenya +254 724659244 Email :in...@we... WEB :weberp.co.ke -- View this message in context: http://weberp-accounting.1478800.n4.nabble.com/Z-ChangeStockCode-php-deactivates-Serialised-tp4658327.html Sent from the web-ERP-developers mailing list archive at Nabble.com. |
|
From: Phil D. <ph...@lo...> - 2015-09-15 08:52:23
|
I prefer 2 personally Phil Phil Daintree Logic Works Ltd - +64 (0)275 567890 http://www.logicworks.co.nz On 15/09/15 01:51, Rafael Chacón wrote: > > Hi Tim, > > Yes, I agree with you. I am looking for a "collegiate" compromise to > standardise the code. We have two options: > 1. A javascript code that considers html code with/without formats. > Cons: more complicated, more execution time. Pros: prevents risk of > unstandardised code. > 2. A javascript code that do not consider html code with/without > formats. Pros: less complicated, less execution time. Cons: risk of > malfunction if someone uses unstandardised code. > > Best regards, Rafael. > > > ---------- Forwarded message ---------- > From: *Tim Schofield* <tim...@gm... > <mailto:tim...@gm...>> > Date: 2015-09-13 12:26 GMT-06:00 > Subject: Re: [WebERP-developers] Table sort javascript routine > To: Rafael Emilio Chacon <raf...@gm... > <mailto:raf...@gm...>> > > > Hi Rafael > > I am travelling and not in a position to give a detailed response > until Friday at the earliest. > > However it is easily resolved if we standardise on the format of > tables we want sorted. That is if all the tables we want sorting had > thead and tbody sections it can be done. > > Thanks > Tim > > Course View Towers, > Plot 21 Yusuf Lule Road, > Kampala > T +256 (0) 312 314 418 > M +256 (0) 752 963 325 > www.weberpafrica.com <http://www.weberpafrica.com> > Twitter: @TimSchofield2 > Blog: http://weberpafrica.blogspot.co.uk > > On 13 Sep 2015 20:39, "Rafael Chacón" <raf...@gm... > <mailto:raf...@gm...>> wrote: > > Hi, > > In this moment, we can not use a sortable table with <thead>, > <tbody> and <tfoot>. Also, we can not use the classes "number", > "centre" and "text" with class="ascending" without messing up the > table sort javascript routine. > > It is pending to fix this. > > Best regards, Rafael. > > > ---------- Forwarded message ---------- > From: <rc...@us... <mailto:rc...@us...>> > Date: 2015-09-13 11:21 GMT-06:00 > Subject: [Web-erp-svn] SF.net SVN: web-erp:[7348] trunk > To: web...@li... > <mailto:web...@li...> > > > Revision: 7348 > http://sourceforge.net/p/web-erp/reponame/7348 > Author: rchacon > Date: 2015-09-13 17:21:49 +0000 (Sun, 13 Sep 2015) > Log Message: > ----------- > In AccountSections.php, add modifications for direct printing. > > Modified Paths: > -------------- > trunk/AccountSections.php > trunk/doc/Change.log > > Modified: trunk/AccountSections.php > =================================================================== > --- trunk/AccountSections.php 2015-09-05 22:20:44 UTC (rev 7347) > +++ trunk/AccountSections.php 2015-09-13 17:21:49 UTC (rev 7348) > @@ -1,11 +1,11 @@ > <?php > /* $Id$*/ > +/* Defines the sections in the general ledger reports. */ > > include('includes/session.inc'); > $Title = _('Account Sections'); > -/* Manual links before header.inc */ > -$ViewTopic = 'GeneralLedger';// Filename in ManualContents.php's TOC. > -$BookMark = 'AccountSections';// Anchor's id in the manual's html > document. > +$ViewTopic = 'GeneralLedger'; > +$BookMark = 'AccountSections'; > include('includes/header.inc'); > > // SOME TEST TO ENSURE THAT AT LEAST INCOME AND COST OF SALES ARE > THERE > @@ -33,13 +33,13 @@ > // DONE WITH MINIMUM TESTS > > > -if (isset($Errors)) { > +if(isset($Errors)) { > unset($Errors); > } > > $Errors = array(); > > -if (isset($_POST['submit'])) { > +if(isset($_POST['submit'])) { > > //initialise no input errors assumed initially before we test > > @@ -50,45 +50,45 @@ > ie the page has called itself with some user input */ > > //first off validate inputs sensible > - if (isset($_POST['SectionID'])) { > + if(isset($_POST['SectionID'])) { > $sql="SELECT sectionid > FROM accountsection > WHERE > sectionid='".$_POST['SectionID']."'"; > $result=DB_query($sql); > > - if ((DB_num_rows($result)!=0 AND > !isset($_POST['SelectedSectionID']))) { > + if((DB_num_rows($result)!=0 AND > !isset($_POST['SelectedSectionID']))) { > $InputError = 1; > prnMsg( _('The account section already > exists in the database'),'error'); > $Errors[$i] = 'SectionID'; > $i++; > } > } > - if (ContainsIllegalCharacters($_POST['SectionName'])) { > + if(ContainsIllegalCharacters($_POST['SectionName'])) { > $InputError = 1; > prnMsg( _('The account section name cannot contain > any illegal characters') ,'error'); > $Errors[$i] = 'SectionName'; > $i++; > } > - if (mb_strlen($_POST['SectionName'])==0) { > + if(mb_strlen($_POST['SectionName'])==0) { > $InputError = 1; > prnMsg( _('The account section name must contain > at least one character') ,'error'); > $Errors[$i] = 'SectionName'; > $i++; > } > - if (isset($_POST['SectionID']) AND > (!is_numeric($_POST['SectionID']))) { > + if(isset($_POST['SectionID']) AND > (!is_numeric($_POST['SectionID']))) { > $InputError = 1; > prnMsg( _('The section number must be an > integer'),'error'); > $Errors[$i] = 'SectionID'; > $i++; > } > - if (isset($_POST['SectionID']) AND > mb_strpos($_POST['SectionID'],".")>0) { > + if(isset($_POST['SectionID']) AND > mb_strpos($_POST['SectionID'],".")>0) { > $InputError = 1; > prnMsg( _('The section number must be an > integer'),'error'); > $Errors[$i] = 'SectionID'; > $i++; > } > > - if (isset($_POST['SelectedSectionID']) AND > $_POST['SelectedSectionID']!='' AND $InputError !=1) { > + if(isset($_POST['SelectedSectionID']) AND > $_POST['SelectedSectionID']!='' AND $InputError !=1) { > > /*SelectedSectionID could also exist if submit had > not been clicked this code would not run in this case cos submit > is false of course see the delete code below*/ > > @@ -96,7 +96,7 @@ > WHERE sectionid = '" . > $_POST['SelectedSectionID'] . "'"; > > $msg = _('Record Updated'); > - } elseif ($InputError !=1) { > + } elseif($InputError !=1) { > > /*SelectedSectionID is null cos no item selected on first > time round so must be adding a record must be submitting new > entries in the new account section form */ > > @@ -108,7 +108,7 @@ > $msg = _('Record inserted'); > } > > - if ($InputError!=1){ > + if($InputError!=1) { > //run the SQL from either of the above possibilites > $result = DB_query($sql); > prnMsg($msg,'success'); > @@ -117,14 +117,14 @@ > unset ($_POST['SectionName']); > } > > -} elseif (isset($_GET['delete'])) { > +} elseif(isset($_GET['delete'])) { > //the link to delete a selected record was clicked instead of the > submit button > > // PREVENT DELETES IF DEPENDENT RECORDS IN 'accountgroups' > $sql= "SELECT COUNT(sectioninaccounts) AS sections FROM > accountgroups WHERE sectioninaccounts='" . > $_GET['SelectedSectionID'] . "'"; > $result = DB_query($sql); > $myrow = DB_fetch_array($result); > - if ($myrow['sections']>0) { > + if($myrow['sections']>0) { > prnMsg( _('Cannot delete this account section > because general ledger accounts groups have been created using > this section'),'warn'); > echo '<div>'; > echo '<br />' . _('There are') . ' ' . > $myrow['sections'] . ' ' . _('general ledger accounts groups that > refer to this account section'); > @@ -149,7 +149,7 @@ > unset ($_POST['SectionName']); > } > > -if (!isset($_GET['SelectedSectionID']) AND > !isset($_POST['SelectedSectionID'])) { > +if(!isset($_GET['SelectedSectionID']) AND > !isset($_POST['SelectedSectionID'])) { > > /* An account section could be posted when one has been edited > and is being updated > or GOT when selected for modification > @@ -166,19 +166,24 @@ > > $ErrMsg = _('Could not get account group sections because'); > $result = DB_query($sql,$ErrMsg); > - echo '<p class="page_title_text"><img alt="" > src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' > . _('Search') . '" />' . ' ' . $Title . '</p><br />'; > +/* echo '<div id="Report">';// Division to identify the > report block.*/ > + echo '<p class="page_title_text"><img alt="" > class="noprint" src="', $RootPath, '/css/', $Theme, > + '/images/maintenance.png" title="', // Icon image. > + _('Account Sections'), '" /> ', // Icon title. > + _('Account Sections'), '</p>';// Page title. > > - echo '<table class="selection"> > + echo '<br /> > + <table class="selection"> > <tr> > - <th class="ascending">' . > _('Section Number') . '</th> > - <th class="ascending">' . > _('Section Description') . '</th> > - <th colspan="2"> </th> > + <th class="ascending">', > _('Section Number'), '</th> > + <th class="ascending">', > _('Section Description'), '</th> > + <th class="noprint" > colspan="2"> </th> > </tr>'; > > $k=0; //row colour counter > while ($myrow = DB_fetch_array($result)) { > > - if ($k==1){ > + if($k==1) { > echo '<tr class="EvenTableRows">'; > $k=0; > } else { > @@ -186,31 +191,32 @@ > $k++; > } > > - echo '<td class="number">' . $myrow['sectionid'] . > '</td> > - <td>' . $myrow['sectionname'] . '</td> > - <td><a href="' . > htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedSectionID=' . > urlencode($myrow['sectionid']), ENT_QUOTES, 'UTF-8') . '">' . > _('Edit') . '</a></td>'; > - if ( $myrow['sectionid'] == '1' or > $myrow['sectionid'] == '2' ) { > - echo '<td><b>' . _('Restricted') . > '</b></td>'; > + echo '<td class="number">', $myrow['sectionid'], > '</td> > + <td class="text">', > $myrow['sectionname'], '</td> > + <td class="noprint"><a href="', > htmlspecialchars($_SERVER['PHP_SELF'], '?SelectedSectionID=', > urlencode($myrow['sectionid']), ENT_QUOTES, 'UTF-8'), '">', > _('Edit'), '</a></td>'; > + if( $myrow['sectionid'] == '1' or > $myrow['sectionid'] == '2' ) { > + echo '<td class="noprint"><b>', > _('Restricted'), '</b></td>'; > } else { > - echo '<td><a href="' . > htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedSectionID=' . > urlencode($myrow['sectionid']) . '&delete=1', ENT_QUOTES, 'UTF-8') > . '">' . _('Delete') . '</a></td>'; > + echo '<td class="noprint"><a href="', > htmlspecialchars($_SERVER['PHP_SELF'], '?SelectedSectionID=', > urlencode($myrow['sectionid']), '&delete=1', ENT_QUOTES, 'UTF-8'), > '">', _('Delete'), '</a></td>'; > } > echo '</tr>'; > } //END WHILE LIST LOOP > echo '</table>'; > +/* echo '</div>';// End div id="Report".*/ > } //end of ifs and buts! > > > -if (isset($_POST['SelectedSectionID']) or > isset($_GET['SelectedSectionID'])) { > +if(isset($_POST['SelectedSectionID']) or > isset($_GET['SelectedSectionID'])) { > echo '<div class="centre"><a href="' . > htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' > . _('Review Account Sections') . '</a></div>'; > } > > -if (! isset($_GET['delete'])) { > +if(! isset($_GET['delete'])) { > > - echo '<form method="post" id="AccountSections" action="' . > htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">'; > - echo '<div><br />'; > - echo '<input type="hidden" name="FormID" value="' . > $_SESSION['FormID'] . '" />'; > + echo '<form action="', > htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" > id="AccountSections" method="post">'; > + echo '<div class="noprint"><br />'; > + echo '<input name="FormID" type="hidden" value="', > $_SESSION['FormID'], '" />'; > > - if (isset($_GET['SelectedSectionID'])) { > + if(isset($_GET['SelectedSectionID'])) { > //editing an existing section > > $sql = "SELECT sectionid, > @@ -219,7 +225,7 @@ > WHERE sectionid='" . > $_GET['SelectedSectionID'] ."'"; > > $result = DB_query($sql); > - if ( DB_num_rows($result) == 0 ) { > + if( DB_num_rows($result) == 0 ) { > prnMsg( _('Could not retrieve the > requested section please try again.'),'warn'); > unset($_GET['SelectedSectionID']); > } else { > @@ -238,13 +244,13 @@ > > } else { > > - if (!isset($_POST['SelectedSectionID'])){ > + if(!isset($_POST['SelectedSectionID'])) { > $_POST['SelectedSectionID']=''; > } > - if (!isset($_POST['SectionID'])){ > + if(!isset($_POST['SectionID'])) { > $_POST['SectionID']=''; > } > - if (!isset($_POST['SectionName'])) { > + if(!isset($_POST['SectionName'])) { > $_POST['SectionName']=''; > } > echo '<table class="selection"> > > Modified: trunk/doc/Change.log > =================================================================== > --- trunk/doc/Change.log 2015-09-05 22:20:44 UTC (rev 7347) > +++ trunk/doc/Change.log 2015-09-13 17:21:49 UTC (rev 7348) > @@ -1,5 +1,6 @@ > webERP Change Log > > +13/9/15 RChacon: In AccountSections.php, add modifications for > direct printing. > 4/9/15 Wes Wolfenbarger: Fix to Z_ImportStocks.php added quotes > to descriptions - also fixes error message when the csv does not > match the template > 27/08/15 Exson: Fixed the allocation status of involved invoice > and credit notes in Credit_Invoice.php. > 19/08/15 RChacon: In AnalysisHorizontalIncome.php, delete > variable $period because it is not used anywhere (thanks Tim). > Extract header.inc from if. > > > ------------------------------------------------------------------------------ > _______________________________________________ > Web-erp-svn mailing list > Web...@li... > <mailto:Web...@li...> > https://lists.sourceforge.net/lists/listinfo/web-erp-svn > > > ------------------------------------------------------------------------------ > > _______________________________________________ > Web-erp-developers mailing list > Web...@li... > <mailto:Web...@li...> > https://lists.sourceforge.net/lists/listinfo/web-erp-developers > > > > > ------------------------------------------------------------------------------ > > > _______________________________________________ > Web-erp-developers mailing list > Web...@li... > https://lists.sourceforge.net/lists/listinfo/web-erp-developers |
|
From: Rafael C. <raf...@gm...> - 2015-09-14 16:16:03
|
Hi, SORRY! I used bad terms: * Actual/relative change is WITHOUT the absolute value function. * Absolute/relative difference is WITH the absolute value function (deletes sign). Now it is fixed. Best regards, Rafael. ---------- Forwarded message ---------- From: <rc...@us...> Date: 2015-09-14 10:08 GMT-06:00 Subject: [Web-erp-svn] SF.net SVN: web-erp:[7350] trunk To: web...@li... Revision: 7350 http://sourceforge.net/p/web-erp/reponame/7350 Author: rchacon Date: 2015-09-14 16:08:50 +0000 (Mon, 14 Sep 2015) Log Message: ----------- Rebuild languages files *.pot, *.po and *.mo to includes new texts. Modified Paths: -------------- trunk/AnalysisHorizontalIncome.php trunk/AnalysisHorizontalPosition.php trunk/doc/Change.log trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo trunk/locale/en_US.utf8/LC_MESSAGES/messages.po trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po Modified: trunk/AnalysisHorizontalIncome.php =================================================================== --- trunk/AnalysisHorizontalIncome.php 2015-09-14 14:43:19 UTC (rev 7349) +++ trunk/AnalysisHorizontalIncome.php 2015-09-14 16:08:50 UTC (rev 7350) @@ -1,9 +1,9 @@ <?php -/* $Id: AnalysisHorizontalIncome.php 7332 2015-08-04 03:27:51Z rchacon $*/ +/* $Id: AnalysisHorizontalIncome.php 7349 2015-09-14 14:43:19Z rchacon $*/ /* Shows the horizontal analysis of the statement of comprehensive income. */ -function RelativeDifference($SelectedPeriod, $PreviousPeriod) { - // Calculates the relative difference between selected and previous periods. Uses percent in locale number format. +function RelativeChange($SelectedPeriod, $PreviousPeriod) { + // Calculates the relative change between selected and previous periods. Uses percent with locale number format. if($PreviousPeriod<>0) { return locale_number_format(($SelectedPeriod-$PreviousPeriod)*100/$PreviousPeriod,$_SESSION['CompanyRecord']['decimalplaces']) . '%'; } else { @@ -32,7 +32,7 @@ echo '<div class="page_help_text">', _('Horizontal analysis (also known as trend analysis) is a financial statement analysis technique that shows changes in the amounts of corresponding financial statement items over a period of time. It is a useful tool to evaluate trend situations.'), '<br />', - _('The statements for two periods are used in horizontal analysis. The earliest period is used as the base period. The items on the later statement are compared with items on the statement of the base period. The changes are shown both in currency (absolute difference) and percentage (relative difference).'), '<br />', + _('The statements for two periods are used in horizontal analysis. The earliest period is used as the base period. The items on the later statement are compared with items on the statement of the base period. The changes are shown both in currency (actual change) and percentage (relative change).'), '<br />', _('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.'), '</div>', // Show a form to allow input of criteria for the report to show: '<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '">', @@ -159,16 +159,16 @@ } echo '<th class="number">', ' - ', $myrow[0], '</th> <th class="number">', _('Last Year'), '</th> - <th class="number">', _('Absolute difference'), '</th> - <th class="number">', _('Relative difference'), '</th> + <th class="number">', _('Actual change'), '</th> + <th class="number">', _('Relative change'), '</th> </tr> </thead> <tfoot> <tr> - <td class="text" colspan="6">',// Prints an explanation of signs in absolute and relative differences: + <td class="text" colspan="6">',// Prints an explanation of signs in actual and relative changes: '<br /><b>', _('Notes'), ':</b><br />', - _('Absolute difference signs: a positive number indicates a variation that increases the net profit; a negative number indicates a variation that decreases the net profit.'), '<br />', - _('Relative difference signs: a positive number indicates an increase in the amount of that account; a negative number indicates a decrease in the amount of that account.'), '<br />', + _('Actual change signs: a positive number indicates a variation that increases the net profit; a negative number indicates a variation that decreases the net profit.'), '<br />', + _('Relative change signs: a positive number indicates an increase in the amount of that account; a negative number indicates a decrease in the amount of that account.'), '<br />', '</td> </tr> </tfoot> @@ -236,7 +236,7 @@ <td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> - <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td> + <td class="number">', RelativeChange(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td> </tr>'; $GrpTotal[$Level]=0; $GrpTotalLY[$Level]=0; @@ -260,7 +260,7 @@ <td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> - <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td> + <td class="number">', RelativeChange(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td> </tr>'; } else {// Costs // <--- @@ -269,7 +269,7 @@ <td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> - <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td> + <td class="number">', RelativeChange(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td> </tr>'; // ---> } @@ -291,7 +291,7 @@ <td class="number"><h2>', locale_number_format(-$SectionTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> <td class="number"><h2>', locale_number_format(-$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> <td class="number"><h2>', locale_number_format(-$SectionTotal+$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> - <td class="number"><h2>', RelativeDifference(-$SectionTotal,-$SectionTotalLY), '</h2></td> + <td class="number"><h2>', RelativeChange(-$SectionTotal,-$SectionTotalLY), '</h2></td> </tr>'; $GPIncome = $SectionTotal; $GPIncomeLY = $SectionTotalLY; @@ -301,7 +301,7 @@ <td class="number"><h2>', locale_number_format(-$SectionTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> <td class="number"><h2>', locale_number_format(-$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> <td class="number"><h2>', locale_number_format(-$SectionTotal+$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> - <td class="number"><h2>', RelativeDifference(-$SectionTotal,-$SectionTotalLY), '</h2></td> + <td class="number"><h2>', RelativeChange(-$SectionTotal,-$SectionTotalLY), '</h2></td> </tr>'; } @@ -312,7 +312,7 @@ <td class="number"><h2>', locale_number_format(-($GPIncome+$SectionTotal),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> <td class="number"><h2>', locale_number_format(-($GPIncomeLY+$SectionTotalLY),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> <td class="number"><h2>', locale_number_format(-($GPIncome+$SectionTotal)+($GPIncomeLY+$SectionTotalLY),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> - <td class="number"><h2>', RelativeDifference(-($GPIncome+$SectionTotal),-($GPIncomeLY+$SectionTotalLY)), '</h2></td> + <td class="number"><h2>', RelativeChange(-($GPIncome+$SectionTotal),-($GPIncomeLY+$SectionTotalLY)), '</h2></td> </tr>'; } @@ -323,7 +323,7 @@ <td class="number"><h2>', locale_number_format(-$PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> <td class="number"><h2>', locale_number_format(-$PeriodTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> <td class="number"><h2>', locale_number_format(-$PeriodTotal+$PeriodTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> - <td class="number"><h2>', RelativeDifference(-$PeriodTotal,-$PeriodTotalLY), '</h2></td> + <td class="number"><h2>', RelativeChange(-$PeriodTotal,-$PeriodTotalLY), '</h2></td> </tr>'; echo $DrawTotalLine; } @@ -383,7 +383,7 @@ <td class="number">', locale_number_format(-$AccountTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format(-$AccountTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format(-$AccountTotal+$AccountTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td> - <td class="number">', RelativeDifference(-$AccountTotal,-$AccountTotalLY), '</td> + <td class="number">', RelativeChange(-$AccountTotal,-$AccountTotalLY), '</td> </tr>'; } else { // <--- @@ -391,7 +391,7 @@ <td class="number">', locale_number_format(-$AccountTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format(-$AccountTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format(-$AccountTotal+$AccountTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td> - <td class="number">', RelativeDifference(-$AccountTotal,-$AccountTotalLY), '</td> + <td class="number">', RelativeChange(-$AccountTotal,-$AccountTotalLY), '</td> </tr>'; } } @@ -414,7 +414,7 @@ <td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> - <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td> + <td class="number">', RelativeChange(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td> </tr>'; } else {// Costs. // <--- @@ -423,7 +423,7 @@ <td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> - <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td> + <td class="number">', RelativeChange(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td> </tr>'; } $GrpTotal[$Level]=0; @@ -443,7 +443,7 @@ <td class="number">', locale_number_format(-$GrpTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format(-$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format(-$GrpTotal[$Level]+$GrpTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> - <td class="number">', RelativeDifference(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td> + <td class="number">', RelativeChange(-$GrpTotal[$Level],-$GrpTotalLY[$Level]), '</td> </tr>'; $GrpTotal[$Level]=0; $GrpTotalLY[$Level]=0; @@ -460,7 +460,7 @@ <td class="number"><h2>', locale_number_format(-$SectionTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> <td class="number"><h2>', locale_number_format(-$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> <td class="number"><h2>', locale_number_format(-$SectionTotal+$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> - <td class="number"><h2>', RelativeDifference(-$SectionTotal,-$SectionTotalLY), '</h2></td> + <td class="number"><h2>', RelativeChange(-$SectionTotal,-$SectionTotalLY), '</h2></td> </tr>'; $GPIncome = $SectionTotal; $GPIncomeLY = $SectionTotalLY; @@ -471,7 +471,7 @@ <td class="number"><h2>', locale_number_format(-$SectionTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> <td class="number"><h2>', locale_number_format(-$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> <td class="number"><h2>', locale_number_format(-$SectionTotal+$SectionTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> - <td class="number"><h2>', RelativeDifference(-$SectionTotal,-$SectionTotalLY), '</h2></td> + <td class="number"><h2>', RelativeChange(-$SectionTotal,-$SectionTotalLY), '</h2></td> </tr>'; } if($Section==2) {// Cost of Sales - need sub total for Gross Profit. @@ -481,7 +481,7 @@ <td class="number"><h2>', locale_number_format(-($GPIncome+$SectionTotal),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> <td class="number"><h2>', locale_number_format(-($GPIncomeLY+$SectionTotalLY),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> <td class="number"><h2>', locale_number_format(-($GPIncome+$SectionTotal)+($GPIncomeLY+$SectionTotalLY),$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> - <td class="number"><h2>', RelativeDifference(-($GPIncome+$SectionTotal),-($GPIncomeLY+$SectionTotalLY)), '</h2></td> + <td class="number"><h2>', RelativeChange(-($GPIncome+$SectionTotal),-($GPIncomeLY+$SectionTotalLY)), '</h2></td> </tr>'; } $Section = $myrow['sectioninaccounts']; @@ -501,7 +501,7 @@ <td class="number"><h2>', locale_number_format(-$PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> <td class="number"><h2>', locale_number_format(-$PeriodTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> <td class="number"><h2>', locale_number_format(-$PeriodTotal+$PeriodTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> - <td class="number"><h2>', RelativeDifference(-$PeriodTotal,-$PeriodTotalLY), '</h2></td> + <td class="number"><h2>', RelativeChange(-$PeriodTotal,-$PeriodTotalLY), '</h2></td> </tr>'; echo $DrawTotalLine; echo '</tbody>', // See comment at the begin of the table. Modified: trunk/AnalysisHorizontalPosition.php =================================================================== --- trunk/AnalysisHorizontalPosition.php 2015-09-14 14:43:19 UTC (rev 7349) +++ trunk/AnalysisHorizontalPosition.php 2015-09-14 16:08:50 UTC (rev 7350) @@ -1,9 +1,9 @@ <?php -/* $Id: AnalysisHorizontalPosition.php 7338 2015-08-13 18:51:07Z rchacon $*/ +/* $Id: AnalysisHorizontalPosition.php 7349 2015-09-14 14:43:19Z rchacon $*/ /* Shows the horizontal analysis of the statement of financial position. */ -function RelativeDifference($SelectedPeriod, $PreviousPeriod) { - // Calculates the relative difference between selected and previous periods. Uses percent in locale number format. +function RelativeChange($SelectedPeriod, $PreviousPeriod) { + // Calculates the relative change between selected and previous periods. Uses percent with locale number format. if($PreviousPeriod<>0) { return locale_number_format(($SelectedPeriod-$PreviousPeriod)*100/$PreviousPeriod,$_SESSION['CompanyRecord']['decimalplaces']) . '%'; } else { @@ -29,7 +29,7 @@ echo '<div class="page_help_text">', _('Horizontal analysis (also known as trend analysis) is a financial statement analysis technique that shows changes in the amounts of corresponding financial statement items over a period of time. It is a useful tool to evaluate trend situations.'), '<br />', - _('The statements for two periods are used in horizontal analysis. The earliest period is used as the base period. The items on the later statement are compared with items on the statement of the base period. The changes are shown both in currency (absolute difference) and percentage (relative difference).'), '<br />', + _('The statements for two periods are used in horizontal analysis. The earliest period is used as the base period. The items on the later statement are compared with items on the statement of the base period. The changes are shown both in currency (actual change) and percentage (relative change).'), '<br />', _('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.'), '</div>', // Show a form to allow input of criteria for the report to show: '<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '">', @@ -122,16 +122,16 @@ } echo '<th class="number">', $BalanceDate, '</th> <th class="number">', _('Last Year'), '</th> - <th class="number">', _('Absolute difference'), '</th> - <th class="number">', _('Relative difference'), '</th> + <th class="number">', _('Actual change'), '</th> + <th class="number">', _('Relative change'), '</th> </tr> </thead> <tfoot> <tr> - <td class="text" colspan="6">',// Prints an explanation of signs in absolute and relative differences: + <td class="text" colspan="6">',// Prints an explanation of signs in actual and relative changes: '<br /><b>', _('Notes'), ':</b><br />', - _('Absolute difference signs: a positive number indicates a source of funds; a negative number indicates an application of funds.'), '<br />', - _('Relative difference signs: a positive number indicates an increase in the amount of that account; a negative number indicates a decrease in the amount of that account.'), '<br />', + _('Actual change signs: a positive number indicates a source of funds; a negative number indicates an application of funds.'), '<br />', + _('Relative change signs: a positive number indicates an increase in the amount of that account; a negative number indicates a decrease in the amount of that account.'), '<br />', '</td> </tr> </tfoot> @@ -216,7 +216,7 @@ <td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format($GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format(-$GroupTotal[$Level]+$GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> - <td class="number">', RelativeDifference(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td> + <td class="number">', RelativeChange(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td> </tr>'; $GroupTotal[$Level]=0; $GroupTotalLY[$Level]=0; @@ -231,7 +231,7 @@ <td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format($GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format(-$GroupTotal[$Level]+$GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> - <td class="number">', RelativeDifference(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td> + <td class="number">', RelativeChange(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td> </tr>'; $GroupTotal[$Level]=0; $GroupTotalLY[$Level]=0; @@ -246,7 +246,7 @@ <td class="number"><h2>', locale_number_format($SectionBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> <td class="number"><h2>', locale_number_format($SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> <td class="number"><h2>', locale_number_format(-$SectionBalance+$SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> - <td class="number"><h2>', RelativeDifference(-$SectionBalance,-$SectionBalanceLY), '</h2></td> + <td class="number"><h2>', RelativeChange(-$SectionBalance,-$SectionBalanceLY), '</h2></td> </tr>'; } $SectionBalance=0; @@ -300,7 +300,7 @@ <td class="number">', locale_number_format($AccountBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format($AccountBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format(-$AccountBalance+$AccountBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</td> - <td class="number">', RelativeDifference(-$AccountBalance,-$AccountBalanceLY), '</td> + <td class="number">', RelativeChange(-$AccountBalance,-$AccountBalanceLY), '</td> </tr>'; } } @@ -315,7 +315,7 @@ <td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format($GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format(-$GroupTotal[$Level]+$GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> - <td class="number">', RelativeDifference(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td> + <td class="number">', RelativeChange(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td> </tr>'; $Level--; } @@ -327,7 +327,7 @@ <td class="number">', locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format($GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> <td class="number">', locale_number_format(-$GroupTotal[$Level]+$GroupTotalLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']), '</td> - <td class="number">', RelativeDifference(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td> + <td class="number">', RelativeChange(-$GroupTotal[$Level],-$GroupTotalLY[$Level]), '</td> </tr>'; echo $DrawTotalLine; echo '<tr> @@ -335,7 +335,7 @@ <td class="number"><h2>', locale_number_format($SectionBalance,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> <td class="number"><h2>', locale_number_format($SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> <td class="number"><h2>', locale_number_format(-$SectionBalance+$SectionBalanceLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> - <td class="number"><h2>', RelativeDifference(-$SectionBalance,-$SectionBalanceLY), '</h2></td> + <td class="number"><h2>', RelativeChange(-$SectionBalance,-$SectionBalanceLY), '</h2></td> </tr>'; $Section = $myrow['sectioninaccounts']; @@ -351,7 +351,7 @@ <td class="number"><h2>', locale_number_format($CheckTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> <td class="number"><h2>', locale_number_format($CheckTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> <td class="number"><h2>', locale_number_format(-$CheckTotal+$CheckTotalLY,$_SESSION['CompanyRecord']['decimalplaces']), '</h2></td> - <td class="number"><h2>', RelativeDifference(-$CheckTotal,-$CheckTotalLY), '</h2></td> + <td class="number"><h2>', RelativeChange(-$CheckTotal,-$CheckTotalLY), '</h2></td> </tr>'; echo $DrawTotalLine; echo '</tbody>', // See comment at the begin of the table. Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-09-14 14:43:19 UTC (rev 7349) +++ trunk/doc/Change.log 2015-09-14 16:08:50 UTC (rev 7350) @@ -1,5 +1,6 @@ webERP Change Log +14/9/15 RChacon: Rebuild languages files *.pot, *.po and *.mo to includes new texts. 14/9/15 RChacon: In AnalysisHorizontalIncome.php, delete duplicated tag. Replaces text "Absolute/Relative variation" with "Absolute/Relative difference" to avoid confusions. 13/9/15 RChacon: In AccountSections.php, add modifications for direct printing. 4/9/15 Wes Wolfenbarger: Fix to Z_ImportStocks.php added quotes to descriptions - also fixes error message when the csv does not match the template Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo =================================================================== (Binary files differ) Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po =================================================================== --- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-09-14 14:43:19 UTC (rev 7349) +++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-09-14 16:08:50 UTC (rev 7350) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: webERP 4.12.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-17 13:40+1200\n" +"POT-Creation-Date: 2015-09-14 09:07-0600\n" "PO-Revision-Date: 2013-06-01 11:19-0600\n" "Last-Translator: Rafael Chacon <raf...@gm...>\n" "Language-Team: Arabic <ar...@li...>\n" @@ -18,7 +18,7 @@ "X-Generator: Poedit 1.5.4\n" "X-Launchpad-Export-Date: 2012-03-07 23:01+0000\n" -#: AccountGroups.php:6 includes/MainMenuLinksArray.php:391 +#: AccountGroups.php:6 includes/MainMenuLinksArray.php:395 msgid "Account Groups" msgstr "مجموعات العضوية" @@ -159,23 +159,23 @@ #: Areas.php:115 Areas.php:124 BankAccounts.php:165 CreditStatus.php:125 #: Currencies.php:247 Currencies.php:255 Currencies.php:263 Currencies.php:273 #: CustomerBranches.php:300 CustomerBranches.php:310 CustomerBranches.php:320 -#: CustomerBranches.php:330 CustomerBranches.php:340 Customers.php:296 -#: Customers.php:305 Customers.php:313 Customers.php:324 Customers.php:334 -#: CustomerTypes.php:146 CustomerTypes.php:156 Departments.php:141 -#: Factors.php:134 FixedAssetCategories.php:137 GLAccounts.php:79 -#: GLAccounts.php:95 Locations.php:279 Locations.php:287 Locations.php:298 -#: Locations.php:307 Locations.php:316 Locations.php:325 Locations.php:334 -#: Locations.php:343 Locations.php:351 Manufacturers.php:154 -#: MRPDemandTypes.php:87 PaymentMethods.php:143 PaymentTerms.php:146 -#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:128 -#: SalesCategories.php:135 SalesPeople.php:159 SalesPeople.php:166 -#: SalesPeople.php:172 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 -#: Shippers.php:93 StockCategories.php:216 Stocks.php:762 Stocks.php:771 -#: Stocks.php:779 Stocks.php:787 Stocks.php:795 Stocks.php:803 Stocks.php:811 -#: Stocks.php:819 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663 -#: SupplierTypes.php:126 TaxCategories.php:132 TaxGroups.php:134 -#: TaxGroups.php:142 TaxProvinces.php:129 UnitsOfMeasure.php:135 -#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:88 +#: CustomerBranches.php:330 CustomerBranches.php:340 CustomerTypes.php:146 +#: CustomerTypes.php:156 Customers.php:296 Customers.php:305 Customers.php:313 +#: Customers.php:324 Customers.php:334 Departments.php:141 Factors.php:134 +#: FixedAssetCategories.php:137 GLAccounts.php:79 GLAccounts.php:95 +#: Locations.php:279 Locations.php:287 Locations.php:298 Locations.php:307 +#: Locations.php:316 Locations.php:325 Locations.php:334 Locations.php:343 +#: Locations.php:351 MRPDemandTypes.php:87 Manufacturers.php:154 +#: PaymentMethods.php:143 PaymentTerms.php:146 PaymentTerms.php:153 +#: PcExpenses.php:161 SalesCategories.php:128 SalesCategories.php:135 +#: SalesPeople.php:159 SalesPeople.php:166 SalesPeople.php:172 +#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93 +#: StockCategories.php:216 Stocks.php:762 Stocks.php:771 Stocks.php:779 +#: Stocks.php:787 Stocks.php:795 Stocks.php:803 Stocks.php:811 Stocks.php:819 +#: SupplierTypes.php:126 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663 +#: TaxCategories.php:132 TaxGroups.php:134 TaxGroups.php:142 +#: TaxProvinces.php:129 UnitsOfMeasure.php:135 WWW_Access.php:88 +#: WorkCentres.php:89 WorkCentres.php:95 msgid "There are" msgstr "يوجد" @@ -225,53 +225,53 @@ msgid "Could not get account groups because" msgstr "لم يتمكن الحصول على مجموات العضو لان" -#: AccountGroups.php:282 AccountSections.php:169 AddCustomerContacts.php:25 -#: AddCustomerContacts.php:27 AddCustomerNotes.php:101 -#: AddCustomerTypeNotes.php:94 AgedDebtors.php:454 AgedSuppliers.php:276 -#: Areas.php:144 AuditTrail.php:11 BOMExtendedQty.php:256 BOMIndented.php:249 -#: BOMIndentedReverse.php:236 BOMInquiry.php:186 BOMListing.php:110 -#: BOMs.php:239 BOMs.php:890 COGSGLPostings.php:19 CompanyPreferences.php:102 -#: CounterReturns.php:1629 CounterSales.php:2097 CounterSales.php:2193 -#: Credit_Invoice.php:276 CreditStatus.php:21 CustEDISetup.php:17 -#: CustItem.php:120 CustItem.php:210 CustItem.php:238 -#: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12 -#: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105 -#: FixedAssetLocations.php:13 FixedAssetRegister.php:16 -#: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185 -#: GLBudgets.php:32 GLJournalInquiry.php:11 GLJournal.php:250 -#: HistoricalTestResults.php:42 InternalStockRequest.php:311 -#: InventoryPlanning.php:459 InventoryPlanningPrefSupplier.php:386 -#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 MRPReport.php:544 -#: NoSalesItems.php:91 PcAssignCashToTab.php:59 PcAssignCashToTab.php:133 -#: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 PDFPickingList.php:29 -#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60 -#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:153 -#: PriceMatrix.php:16 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 -#: Prices.php:11 ProductSpecs.php:38 PurchaseByPrefSupplier.php:305 -#: PurchData.php:241 PurchData.php:373 PurchData.php:401 QATests.php:22 -#: RecurringSalesOrders.php:320 RelatedItemsUpdate.php:24 -#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11 -#: SalesGLPostings.php:19 SalesGraph.php:40 SalesPeople.php:28 -#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11 -#: SelectContract.php:69 SelectCreditItems.php:220 SelectCreditItems.php:291 -#: SelectCustomer.php:266 SelectGLAccount.php:65 SelectOrderItems.php:559 -#: SelectOrderItems.php:1467 SelectOrderItems.php:1567 SelectProduct.php:502 -#: SelectQASamples.php:45 SelectSalesOrder.php:512 SelectSupplier.php:14 -#: SelectSupplier.php:220 SelectWorkOrder.php:9 SelectWorkOrder.php:174 -#: SellThroughSupport.php:229 ShipmentCosting.php:11 Shipments.php:17 -#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8 -#: StockLocMovements.php:14 StockLocStatus.php:29 +#: AccountGroups.php:282 AddCustomerContacts.php:25 AddCustomerContacts.php:27 +#: AddCustomerNotes.php:101 AddCustomerTypeNotes.php:94 AgedDebtors.php:454 +#: AgedSuppliers.php:276 Areas.php:144 AuditTrail.php:11 +#: BOMExtendedQty.php:256 BOMIndented.php:249 BOMIndentedReverse.php:236 +#: BOMInquiry.php:186 BOMListing.php:110 BOMs.php:239 BOMs.php:890 +#: COGSGLPostings.php:19 CompanyPreferences.php:102 CounterReturns.php:1629 +#: CounterSales.php:2097 CounterSales.php:2193 CreditStatus.php:21 +#: Credit_Invoice.php:276 CustEDISetup.php:17 CustItem.php:120 +#: CustItem.php:210 CustItem.php:238 DebtorsAtPeriodEnd.php:129 +#: DiscountCategories.php:12 DiscountCategories.php:149 DiscountMatrix.php:16 +#: EDIMessageFormat.php:105 FixedAssetLocations.php:13 +#: FixedAssetRegister.php:16 FixedAssetRegister.php:256 +#: FixedAssetTransfer.php:14 FormDesigner.php:185 GLBudgets.php:32 +#: GLJournal.php:250 GLJournalInquiry.php:11 HistoricalTestResults.php:42 +#: InternalStockRequest.php:311 InventoryPlanning.php:459 +#: InventoryPlanningPrefSupplier.php:386 MRPReport.php:544 +#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 NoSalesItems.php:91 +#: PDFPickingList.php:29 PDFStockLocTransfer.php:16 POReport.php:60 +#: POReport.php:64 POReport.php:68 PO_AuthorisationLevels.php:10 +#: PO_SelectOSPurchOrder.php:153 PcAssignCashToTab.php:59 +#: PcAssignCashToTab.php:133 PcAssignCashToTab.php:149 +#: PcAssignCashToTab.php:193 PriceMatrix.php:16 Prices.php:11 +#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 ProductSpecs.php:38 +#: PurchData.php:241 PurchData.php:373 PurchData.php:401 +#: PurchaseByPrefSupplier.php:305 QATests.php:22 RecurringSalesOrders.php:320 +#: RelatedItemsUpdate.php:24 SalesAnalReptCols.php:51 SalesAnalRepts.php:14 +#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:40 +#: SalesPeople.php:28 SalesTypes.php:20 SelectAsset.php:48 +#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:220 +#: SelectCreditItems.php:291 SelectCustomer.php:266 SelectGLAccount.php:65 +#: SelectOrderItems.php:559 SelectOrderItems.php:1467 +#: SelectOrderItems.php:1567 SelectProduct.php:502 SelectQASamples.php:45 +#: SelectSalesOrder.php:512 SelectSupplier.php:14 SelectSupplier.php:220 +#: SelectWorkOrder.php:9 SelectWorkOrder.php:174 SellThroughSupport.php:229 +#: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160 +#: Shipt_Select.php:8 StockLocMovements.php:14 StockLocStatus.php:29 #: StockSerialItemResearch.php:30 SupplierPriceList.php:14 #: SupplierPriceList.php:224 SupplierPriceList.php:394 #: SupplierPriceList.php:398 SupplierPriceList.php:449 -#: SupplierPriceList.php:499 Suppliers.php:304 SupplierTenderCreate.php:556 +#: SupplierPriceList.php:499 SupplierTenderCreate.php:556 #: SupplierTenderCreate.php:664 SupplierTenders.php:322 -#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TestPlanResults.php:27 -#: TopItems.php:118 UnitsOfMeasure.php:10 WhereUsedInquiry.php:18 -#: WorkCentres.php:111 WorkCentres.php:163 WorkOrderCosting.php:22 -#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:34 -#: WorkOrderStatus.php:58 WWW_Users.php:34 Z_BottomUpCosts.php:57 -#: ../webSHOP/includes/header.php:217 +#: SupplierTenders.php:388 SupplierTransInquiry.php:10 Suppliers.php:304 +#: TestPlanResults.php:27 TopItems.php:118 UnitsOfMeasure.php:10 +#: WWW_Users.php:34 WhereUsedInquiry.php:18 WorkCentres.php:111 +#: WorkCentres.php:163 WorkOrderCosting.php:22 WorkOrderEntry.php:11 +#: WorkOrderIssue.php:22 WorkOrderReceive.php:34 WorkOrderStatus.php:58 +#: Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:251 msgid "Search" msgstr "إبحث" @@ -301,19 +301,19 @@ #: ContractCosting.php:202 Currencies.php:342 Currencies.php:520 #: Currencies.php:522 CustomerBranches.php:452 Customers.php:659 #: Customers.php:1049 Customers.php:1055 Customers.php:1058 -#: DailyBankTransactions.php:156 DeliveryDetails.php:1157 -#: DeliveryDetails.php:1198 DeliveryDetails.php:1201 FormDesigner.php:101 +#: DailyBankTransactions.php:156 DeliveryDetails.php:1158 +#: DeliveryDetails.php:1199 DeliveryDetails.php:1202 FormDesigner.php:101 #: GLTransInquiry.php:74 Labels.php:601 Labels.php:603 Labels.php:628 -#: Locations.php:446 Locations.php:668 Locations.php:670 Locations.php:683 -#: Locations.php:685 Locations.php:701 MRPCalendar.php:224 MRP.php:554 -#: MRP.php:558 MRP.php:562 MRP.php:566 MRP.php:570 PaymentMethods.php:206 -#: PaymentMethods.php:207 PaymentMethods.php:208 PaymentMethods.php:209 -#: PaymentMethods.php:275 PaymentMethods.php:282 PaymentMethods.php:289 -#: PaymentMethods.php:296 PcAuthorizeExpenses.php:248 PDFChequeListing.php:65 -#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 PDFWOPrint.php:600 +#: Locations.php:446 Locations.php:670 Locations.php:672 Locations.php:685 +#: Locations.php:687 Locations.php:703 MRP.php:554 MRP.php:558 MRP.php:562 +#: MRP.php:566 MRP.php:570 MRPCalendar.php:224 PDFChequeListing.php:65 +#: PDFDIFOT.php:80 PDFDeliveryDifferences.php:76 PDFWOPrint.php:600 #: PDFWOPrint.php:604 PO_AuthorisationLevels.php:134 #: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413 -#: PO_PDFPurchOrder.php:416 ProductSpecs.php:188 ProductSpecs.php:409 +#: PO_PDFPurchOrder.php:416 PaymentMethods.php:206 PaymentMethods.php:207 +#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:275 +#: PaymentMethods.php:282 PaymentMethods.php:289 PaymentMethods.php:296 +#: PcAuthorizeExpenses.php:248 ProductSpecs.php:188 ProductSpecs.php:409 #: ProductSpecs.php:414 ProductSpecs.php:420 ProductSpecs.php:425 #: ProductSpecs.php:430 ProductSpecs.php:562 ProductSpecs.php:608 #: ProductSpecs.php:610 ProductSpecs.php:621 ProductSpecs.php:623 @@ -352,32 +352,32 @@ #: TestPlanResults.php:532 TestPlanResults.php:747 TestPlanResults.php:864 #: TestPlanResults.php:924 TestPlanResults.php:928 WWW_Users.php:516 #: WWW_Users.php:518 WWW_Users.php:689 WWW_Users.php:691 WWW_Users.php:704 -#: WWW_Users.php:706 +#: WWW_Users.php:706 reportwriter/languages/en_US/reports.php:114 msgid "Yes" msgstr "موافق" #: AccountGroups.php:313 AccountGroups.php:450 AccountGroups.php:452 -#: BankAccounts.php:218 BankAccounts.php:412 BankAccounts.php:414 -#: BankAccounts.php:418 BankAccounts.php:426 BOMs.php:130 BOMs.php:801 -#: BOMs.php:805 CompanyPreferences.php:424 CompanyPreferences.php:428 +#: BOMs.php:130 BOMs.php:801 BOMs.php:805 BankAccounts.php:218 +#: BankAccounts.php:412 BankAccounts.php:414 BankAccounts.php:418 +#: BankAccounts.php:426 CompanyPreferences.php:424 CompanyPreferences.php:428 #: CompanyPreferences.php:439 CompanyPreferences.php:443 #: CompanyPreferences.php:454 CompanyPreferences.php:458 #: ContractCosting.php:200 Currencies.php:344 Currencies.php:525 #: Currencies.php:527 CustomerBranches.php:452 Customers.php:658 #: Customers.php:1047 Customers.php:1054 Customers.php:1057 -#: DailyBankTransactions.php:158 DeliveryDetails.php:1158 -#: DeliveryDetails.php:1199 DeliveryDetails.php:1202 FormDesigner.php:99 +#: DailyBankTransactions.php:158 DeliveryDetails.php:1159 +#: DeliveryDetails.php:1200 DeliveryDetails.php:1203 FormDesigner.php:99 #: GLTransInquiry.php:93 Labels.php:600 Labels.php:604 Labels.php:629 -#: Locations.php:446 Locations.php:673 Locations.php:675 Locations.php:688 -#: Locations.php:690 Locations.php:702 MRPCalendar.php:226 MRP.php:552 -#: MRP.php:556 MRP.php:560 MRP.php:564 MRP.php:568 NoSalesItems.php:191 -#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:208 -#: PaymentMethods.php:209 PaymentMethods.php:276 PaymentMethods.php:283 -#: PaymentMethods.php:290 PaymentMethods.php:297 PcAuthorizeExpenses.php:246 -#: PDFChequeListing.php:64 PDFDeliveryDifferences.php:75 PDFDIFOT.php:79 +#: Locations.php:446 Locations.php:675 Locations.php:677 Locations.php:690 +#: Locations.php:692 Locations.php:704 MRP.php:552 MRP.php:556 MRP.php:560 +#: MRP.php:564 MRP.php:568 MRPCalendar.php:226 NoSalesItems.php:191 +#: PDFChequeListing.php:64 PDFDIFOT.php:79 PDFDeliveryDifferences.php:75 #: PDFWOPrint.php:601 PDFWOPrint.php:605 PO_AuthorisationLevels.php:136 #: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414 -#: PO_PDFPurchOrder.php:417 ProductSpecs.php:191 ProductSpecs.php:411 +#: PO_PDFPurchOrder.php:417 PaymentMethods.php:206 PaymentMethods.php:207 +#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:276 +#: PaymentMethods.php:283 PaymentMethods.php:290 PaymentMethods.php:297 +#: PcAuthorizeExpenses.php:246 ProductSpecs.php:191 ProductSpecs.php:411 #: ProductSpecs.php:417 ProductSpecs.php:422 ProductSpecs.php:427 #: ProductSpecs.php:432 ProductSpecs.php:613 ProductSpecs.php:615 #: ProductSpecs.php:626 ProductSpecs.php:628 ProductSpecs.php:639 @@ -417,37 +417,40 @@ #: TestPlanResults.php:925 TestPlanResults.php:927 WWW_Users.php:515 #: WWW_Users.php:519 WWW_Users.php:688 WWW_Users.php:692 WWW_Users.php:703 #: WWW_Users.php:707 includes/PDFLowGPPageHeader.inc:44 +#: reportwriter/languages/en_US/reports.php:82 msgid "No" msgstr "ﻻ" -#: AccountGroups.php:322 AccountSections.php:191 AddCustomerContacts.php:148 +#: AccountGroups.php:322 AccountSections.php:196 AddCustomerContacts.php:148 #: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164 -#: BankAccounts.php:243 BOMs.php:157 COGSGLPostings.php:112 +#: BOMs.php:157 BankAccounts.php:243 COGSGLPostings.php:112 #: COGSGLPostings.php:219 CreditStatus.php:175 Currencies.php:374 #: Currencies.php:391 CustItem.php:166 CustomerBranches.php:456 -#: Customers.php:1131 Customers.php:1165 CustomerTypes.php:205 +#: CustomerTypes.php:205 Customers.php:1131 Customers.php:1165 #: Departments.php:186 EDIMessageFormat.php:150 Factors.php:334 #: FixedAssetCategories.php:190 FixedAssetLocations.php:111 -#: FreightCosts.php:253 GeocodeSetup.php:173 GLAccounts.php:317 GLTags.php:96 +#: FreightCosts.php:253 GLAccounts.php:317 GLTags.php:96 GeocodeSetup.php:173 #: ImportBankTransAnalysis.php:223 InternalStockRequest.php:293 Labels.php:333 -#: Labels.php:358 Locations.php:439 MailingGroupMaintenance.php:178 -#: MaintenanceTasks.php:118 Manufacturers.php:217 MRPDemands.php:309 -#: MRPDemandTypes.php:120 PaymentMethods.php:210 PaymentTerms.php:205 -#: PcAssignCashToTab.php:277 PcClaimExpensesFromTab.php:276 PcExpenses.php:226 -#: PcTabs.php:236 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151 -#: PriceMatrix.php:287 Prices_Customer.php:286 Prices.php:253 -#: ProductSpecs.php:465 PurchData.php:312 QATests.php:467 -#: SalesCategories.php:272 SalesGLPostings.php:137 SalesGLPostings.php:255 -#: SalesPeople.php:240 SalesTypes.php:206 SecurityTokens.php:130 -#: SelectCustomer.php:615 SelectCustomer.php:634 SelectCustomer.php:664 -#: SelectCustomer.php:682 SelectCustomer.php:706 SelectCustomer.php:723 -#: SelectGLAccount.php:117 SelectGLAccount.php:132 SelectQASamples.php:417 -#: SellThroughSupport.php:298 Shippers.php:144 StockCategories.php:296 +#: Labels.php:358 Locations.php:439 MRPDemandTypes.php:120 MRPDemands.php:309 +#: MailingGroupMaintenance.php:178 MaintenanceTasks.php:118 +#: Manufacturers.php:217 PO_AuthorisationLevels.php:151 PaymentMethods.php:210 +#: PaymentTerms.php:205 PcAssignCashToTab.php:277 +#: PcClaimExpensesFromTab.php:276 PcExpenses.php:226 PcTabs.php:236 +#: PcTypeTabs.php:180 PriceMatrix.php:287 Prices.php:253 +#: Prices_Customer.php:286 ProductSpecs.php:465 PurchData.php:312 +#: QATests.php:467 SalesCategories.php:272 SalesGLPostings.php:137 +#: SalesGLPostings.php:255 SalesPeople.php:240 SalesTypes.php:206 +#: SecurityTokens.php:130 SelectCustomer.php:615 SelectCustomer.php:634 +#: SelectCustomer.php:664 SelectCustomer.php:682 SelectCustomer.php:706 +#: SelectCustomer.php:723 SelectGLAccount.php:117 SelectGLAccount.php:132 +#: SelectQASamples.php:417 SellThroughSupport.php:298 Shippers.php:144 +#: StockCategories.php:296 SuppTransGLAnalysis.php:125 #: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170 -#: SuppTransGLAnalysis.php:125 TaxAuthorities.php:172 TaxCategories.php:184 -#: TaxGroups.php:190 TaxProvinces.php:179 UnitsOfMeasure.php:185 -#: WorkCentres.php:142 WWW_Access.php:132 WWW_Users.php:350 -#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:20 +#: TaxAuthorities.php:172 TaxCategories.php:184 TaxGroups.php:190 +#: TaxProvinces.php:179 UnitsOfMeasure.php:185 WWW_Access.php:132 +#: WWW_Users.php:350 WorkCentres.php:142 includes/InputSerialItems.php:110 +#: includes/OutputSerialItems.php:20 +#: reportwriter/languages/en_US/reports.php:143 #, php-format msgid "Edit" msgstr "تحرير" @@ -456,26 +459,26 @@ msgid "Are you sure you wish to delete this account group?" msgstr "" -#: AccountGroups.php:323 AccountSections.php:195 AddCustomerContacts.php:149 +#: AccountGroups.php:323 AccountSections.php:200 AddCustomerContacts.php:149 #: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165 -#: BankAccounts.php:244 BOMs.php:159 COGSGLPostings.php:113 +#: BOMs.php:159 BankAccounts.php:244 COGSGLPostings.php:113 #: COGSGLPostings.php:220 ContractBOM.php:272 ContractOtherReqts.php:124 -#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:409 -#: CreditStatus.php:176 Currencies.php:377 CustItem.php:167 -#: CustomerReceipt.php:989 Customers.php:1166 CustomerTypes.php:206 +#: CounterReturns.php:740 CounterSales.php:836 CreditStatus.php:176 +#: Credit_Invoice.php:409 Currencies.php:377 CustItem.php:167 +#: CustomerReceipt.php:987 CustomerTypes.php:206 Customers.php:1166 #: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183 #: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254 -#: GeocodeSetup.php:174 GLAccounts.php:318 GLJournal.php:430 GLTags.php:97 +#: GLAccounts.php:318 GLJournal.php:430 GLTags.php:97 GeocodeSetup.php:174 #: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184 #: InternalStockRequest.php:294 Labels.php:334 Labels.php:359 Labels.php:607 -#: Locations.php:440 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119 -#: Manufacturers.php:218 MRPDemands.php:310 MRPDemandTypes.php:121 -#: PaymentMethods.php:211 Payments.php:1112 PaymentTerms.php:206 +#: Locations.php:440 MRPDemandTypes.php:121 MRPDemands.php:310 +#: MailingGroupMaintenance.php:179 MaintenanceTasks.php:119 +#: Manufacturers.php:218 PO_AuthorisationLevels.php:153 PO_Items.php:768 +#: PaymentMethods.php:211 PaymentTerms.php:206 Payments.php:1112 #: PcAssignCashToTab.php:281 PcClaimExpensesFromTab.php:277 PcExpenses.php:227 #: PcExpensesTypeTab.php:187 PcTabs.php:237 PcTypeTabs.php:181 -#: PO_AuthorisationLevels.php:153 PO_Items.php:768 PriceMatrix.php:286 -#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:466 -#: PurchData.php:314 PurchData.php:721 QATests.php:468 +#: PriceMatrix.php:286 Prices.php:254 Prices_Customer.php:287 +#: ProductSpecs.php:466 PurchData.php:314 PurchData.php:721 QATests.php:468 #: RelatedItemsUpdate.php:155 RelatedItemsUpdate.php:170 #: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:273 #: SalesGLPostings.php:138 SalesGLPostings.php:256 SalesPeople.php:241 @@ -486,14 +489,15 @@ #: SellThroughSupport.php:299 Shipments.php:438 Shippers.php:145 #: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626 #: StockLocTransfer.php:325 SuppContractChgs.php:99 SuppCreditGRNs.php:117 -#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147 SupplierContacts.php:166 +#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147 SuppShiptChgs.php:90 +#: SuppTransGLAnalysis.php:126 SupplierContacts.php:166 #: SupplierTenderCreate.php:422 SupplierTenderCreate.php:452 -#: SupplierTypes.php:172 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:126 -#: TaxAuthorities.php:173 TaxCategories.php:186 TaxGroups.php:191 -#: TaxProvinces.php:180 TestPlanResults.php:920 UnitsOfMeasure.php:186 -#: WorkCentres.php:143 WOSerialNos.php:335 WWW_Access.php:133 -#: WWW_Users.php:351 includes/InputSerialItemsKeyed.php:60 +#: SupplierTypes.php:172 TaxAuthorities.php:173 TaxCategories.php:186 +#: TaxGroups.php:191 TaxProvinces.php:180 TestPlanResults.php:920 +#: UnitsOfMeasure.php:186 WOSerialNos.php:335 WWW_Access.php:133 +#: WWW_Users.php:351 WorkCentres.php:143 includes/InputSerialItemsKeyed.php:60 #: includes/OutputSerialItems.php:99 +#: reportwriter/languages/en_US/reports.php:141 #, php-format msgid "Delete" msgstr "حذف" @@ -556,27 +560,28 @@ "ledger accounts should display in the trial balance" msgstr "" -#: AccountGroups.php:462 AccountSections.php:262 AddCustomerContacts.php:260 +#: AccountGroups.php:462 AccountSections.php:268 AddCustomerContacts.php:260 #: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229 -#: BankAccounts.php:433 BOMs.php:818 COGSGLPostings.php:368 -#: CreditStatus.php:259 Currencies.php:534 CustLoginSetup.php:273 +#: BOMs.php:818 BankAccounts.php:433 COGSGLPostings.php:368 +#: CreditStatus.php:259 Currencies.php:537 CustLoginSetup.php:273 #: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248 #: FixedAssetCategories.php:350 FixedAssetLocations.php:161 -#: FreightCosts.php:371 GeocodeSetup.php:271 GLAccounts.php:265 Labels.php:641 -#: Locations.php:714 Manufacturers.php:312 MRPDemands.php:424 -#: MRPDemandTypes.php:188 OffersReceived.php:57 OffersReceived.php:146 -#: PaymentMethods.php:302 PaymentTerms.php:310 PO_AuthorisationLevels.php:264 +#: FreightCosts.php:371 GLAccounts.php:265 GeocodeSetup.php:271 Labels.php:641 +#: Locations.php:716 MRPDemandTypes.php:188 MRPDemands.php:424 +#: Manufacturers.php:312 OffersReceived.php:57 OffersReceived.php:146 +#: PO_AuthorisationLevels.php:264 PaymentMethods.php:302 PaymentTerms.php:310 #: PriceMatrix.php:230 Prices_Customer.php:369 ProductSpecs.php:661 #: QATests.php:359 SalesAnalReptCols.php:552 SalesAnalRepts.php:519 #: SalesGLPostings.php:427 SalesPeople.php:381 SelectQASamples.php:531 #: SelectQASamples.php:601 Shippers.php:203 StockCategories.php:653 -#: SupplierContacts.php:284 SuppLoginSetup.php:291 TaxAuthorities.php:327 +#: SuppLoginSetup.php:291 SupplierContacts.php:284 TaxAuthorities.php:327 #: TaxCategories.php:244 TaxProvinces.php:234 TestPlanResults.php:967 -#: UnitsOfMeasure.php:241 WorkCentres.php:283 WWW_Users.php:774 +#: UnitsOfMeasure.php:241 WWW_Users.php:774 WorkCentres.php:283 msgid "Enter Information" msgstr "أدخل المعلومات" -#: AccountSections.php:5 includes/MainMenuLinksArray.php:390 +#: AccountSections.php:6 AccountSections.php:172 AccountSec... [truncated message content] |
|
From: Rafael C. <raf...@gm...> - 2015-09-14 13:51:49
|
Hi Tim, Yes, I agree with you. I am looking for a "collegiate" compromise to standardise the code. We have two options: 1. A javascript code that considers html code with/without formats. Cons: more complicated, more execution time. Pros: prevents risk of unstandardised code. 2. A javascript code that do not consider html code with/without formats. Pros: less complicated, less execution time. Cons: risk of malfunction if someone uses unstandardised code. Best regards, Rafael. ---------- Forwarded message ---------- From: Tim Schofield <tim...@gm...> Date: 2015-09-13 12:26 GMT-06:00 Subject: Re: [WebERP-developers] Table sort javascript routine To: Rafael Emilio Chacon <raf...@gm...> Hi Rafael I am travelling and not in a position to give a detailed response until Friday at the earliest. However it is easily resolved if we standardise on the format of tables we want sorted. That is if all the tables we want sorting had thead and tbody sections it can be done. Thanks Tim Course View Towers, Plot 21 Yusuf Lule Road, Kampala T +256 (0) 312 314 418 M +256 (0) 752 963 325 www.weberpafrica.com Twitter: @TimSchofield2 Blog: http://weberpafrica.blogspot.co.uk On 13 Sep 2015 20:39, "Rafael Chacón" <raf...@gm...> wrote: > Hi, > > In this moment, we can not use a sortable table with <thead>, <tbody> and > <tfoot>. Also, we can not use the classes "number", "centre" and "text" > with class="ascending" without messing up the table sort javascript routine. > > It is pending to fix this. > > Best regards, Rafael. > > > ---------- Forwarded message ---------- > From: <rc...@us...> > Date: 2015-09-13 11:21 GMT-06:00 > Subject: [Web-erp-svn] SF.net SVN: web-erp:[7348] trunk > To: web...@li... > > > Revision: 7348 > http://sourceforge.net/p/web-erp/reponame/7348 > Author: rchacon > Date: 2015-09-13 17:21:49 +0000 (Sun, 13 Sep 2015) > Log Message: > ----------- > In AccountSections.php, add modifications for direct printing. > > Modified Paths: > -------------- > trunk/AccountSections.php > trunk/doc/Change.log > > Modified: trunk/AccountSections.php > =================================================================== > --- trunk/AccountSections.php 2015-09-05 22:20:44 UTC (rev 7347) > +++ trunk/AccountSections.php 2015-09-13 17:21:49 UTC (rev 7348) > @@ -1,11 +1,11 @@ > <?php > /* $Id$*/ > +/* Defines the sections in the general ledger reports. */ > > include('includes/session.inc'); > $Title = _('Account Sections'); > -/* Manual links before header.inc */ > -$ViewTopic = 'GeneralLedger';// Filename in ManualContents.php's TOC. > -$BookMark = 'AccountSections';// Anchor's id in the manual's html > document. > +$ViewTopic = 'GeneralLedger'; > +$BookMark = 'AccountSections'; > include('includes/header.inc'); > > // SOME TEST TO ENSURE THAT AT LEAST INCOME AND COST OF SALES ARE THERE > @@ -33,13 +33,13 @@ > // DONE WITH MINIMUM TESTS > > > -if (isset($Errors)) { > +if(isset($Errors)) { > unset($Errors); > } > > $Errors = array(); > > -if (isset($_POST['submit'])) { > +if(isset($_POST['submit'])) { > > //initialise no input errors assumed initially before we test > > @@ -50,45 +50,45 @@ > ie the page has called itself with some user input */ > > //first off validate inputs sensible > - if (isset($_POST['SectionID'])) { > + if(isset($_POST['SectionID'])) { > $sql="SELECT sectionid > FROM accountsection > WHERE > sectionid='".$_POST['SectionID']."'"; > $result=DB_query($sql); > > - if ((DB_num_rows($result)!=0 AND > !isset($_POST['SelectedSectionID']))) { > + if((DB_num_rows($result)!=0 AND > !isset($_POST['SelectedSectionID']))) { > $InputError = 1; > prnMsg( _('The account section already exists in > the database'),'error'); > $Errors[$i] = 'SectionID'; > $i++; > } > } > - if (ContainsIllegalCharacters($_POST['SectionName'])) { > + if(ContainsIllegalCharacters($_POST['SectionName'])) { > $InputError = 1; > prnMsg( _('The account section name cannot contain any > illegal characters') ,'error'); > $Errors[$i] = 'SectionName'; > $i++; > } > - if (mb_strlen($_POST['SectionName'])==0) { > + if(mb_strlen($_POST['SectionName'])==0) { > $InputError = 1; > prnMsg( _('The account section name must contain at least > one character') ,'error'); > $Errors[$i] = 'SectionName'; > $i++; > } > - if (isset($_POST['SectionID']) AND > (!is_numeric($_POST['SectionID']))) { > + if(isset($_POST['SectionID']) AND > (!is_numeric($_POST['SectionID']))) { > $InputError = 1; > prnMsg( _('The section number must be an > integer'),'error'); > $Errors[$i] = 'SectionID'; > $i++; > } > - if (isset($_POST['SectionID']) AND > mb_strpos($_POST['SectionID'],".")>0) { > + if(isset($_POST['SectionID']) AND > mb_strpos($_POST['SectionID'],".")>0) { > $InputError = 1; > prnMsg( _('The section number must be an > integer'),'error'); > $Errors[$i] = 'SectionID'; > $i++; > } > > - if (isset($_POST['SelectedSectionID']) AND > $_POST['SelectedSectionID']!='' AND $InputError !=1) { > + if(isset($_POST['SelectedSectionID']) AND > $_POST['SelectedSectionID']!='' AND $InputError !=1) { > > /*SelectedSectionID could also exist if submit had not > been clicked this code would not run in this case cos submit is false of > course see the delete code below*/ > > @@ -96,7 +96,7 @@ > WHERE sectionid = '" . > $_POST['SelectedSectionID'] . "'"; > > $msg = _('Record Updated'); > - } elseif ($InputError !=1) { > + } elseif($InputError !=1) { > > /*SelectedSectionID is null cos no item selected on first time > round so must be adding a record must be submitting new entries in the new > account section form */ > > @@ -108,7 +108,7 @@ > $msg = _('Record inserted'); > } > > - if ($InputError!=1){ > + if($InputError!=1) { > //run the SQL from either of the above possibilites > $result = DB_query($sql); > prnMsg($msg,'success'); > @@ -117,14 +117,14 @@ > unset ($_POST['SectionName']); > } > > -} elseif (isset($_GET['delete'])) { > +} elseif(isset($_GET['delete'])) { > //the link to delete a selected record was clicked instead of the submit > button > > // PREVENT DELETES IF DEPENDENT RECORDS IN 'accountgroups' > $sql= "SELECT COUNT(sectioninaccounts) AS sections FROM > accountgroups WHERE sectioninaccounts='" . $_GET['SelectedSectionID'] . "'"; > $result = DB_query($sql); > $myrow = DB_fetch_array($result); > - if ($myrow['sections']>0) { > + if($myrow['sections']>0) { > prnMsg( _('Cannot delete this account section because > general ledger accounts groups have been created using this > section'),'warn'); > echo '<div>'; > echo '<br />' . _('There are') . ' ' . $myrow['sections'] > . ' ' . _('general ledger accounts groups that refer to this account > section'); > @@ -149,7 +149,7 @@ > unset ($_POST['SectionName']); > } > > -if (!isset($_GET['SelectedSectionID']) AND > !isset($_POST['SelectedSectionID'])) { > +if(!isset($_GET['SelectedSectionID']) AND > !isset($_POST['SelectedSectionID'])) { > > /* An account section could be posted when one has been edited and is > being updated > or GOT when selected for modification > @@ -166,19 +166,24 @@ > > $ErrMsg = _('Could not get account group sections because'); > $result = DB_query($sql,$ErrMsg); > - echo '<p class="page_title_text"><img alt="" > src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . > _('Search') . '" />' . ' ' . $Title . '</p><br />'; > +/* echo '<div id="Report">';// Division to identify the report > block.*/ > + echo '<p class="page_title_text"><img alt="" class="noprint" > src="', $RootPath, '/css/', $Theme, > + '/images/maintenance.png" title="', // Icon image. > + _('Account Sections'), '" /> ', // Icon title. > + _('Account Sections'), '</p>';// Page title. > > - echo '<table class="selection"> > + echo '<br /> > + <table class="selection"> > <tr> > - <th class="ascending">' . _('Section > Number') . '</th> > - <th class="ascending">' . _('Section > Description') . '</th> > - <th colspan="2"> </th> > + <th class="ascending">', _('Section > Number'), '</th> > + <th class="ascending">', _('Section > Description'), '</th> > + <th class="noprint" colspan="2"> </th> > </tr>'; > > $k=0; //row colour counter > while ($myrow = DB_fetch_array($result)) { > > - if ($k==1){ > + if($k==1) { > echo '<tr class="EvenTableRows">'; > $k=0; > } else { > @@ -186,31 +191,32 @@ > $k++; > } > > - echo '<td class="number">' . $myrow['sectionid'] . '</td> > - <td>' . $myrow['sectionname'] . '</td> > - <td><a href="' . > htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedSectionID=' . > urlencode($myrow['sectionid']), ENT_QUOTES, 'UTF-8') . '">' . _('Edit') . > '</a></td>'; > - if ( $myrow['sectionid'] == '1' or $myrow['sectionid'] == > '2' ) { > - echo '<td><b>' . _('Restricted') . '</b></td>'; > + echo '<td class="number">', $myrow['sectionid'], '</td> > + <td class="text">', $myrow['sectionname'], > '</td> > + <td class="noprint"><a href="', > htmlspecialchars($_SERVER['PHP_SELF'], '?SelectedSectionID=', > urlencode($myrow['sectionid']), ENT_QUOTES, 'UTF-8'), '">', _('Edit'), > '</a></td>'; > + if( $myrow['sectionid'] == '1' or $myrow['sectionid'] == > '2' ) { > + echo '<td class="noprint"><b>', _('Restricted'), > '</b></td>'; > } else { > - echo '<td><a href="' . > htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedSectionID=' . > urlencode($myrow['sectionid']) . '&delete=1', ENT_QUOTES, 'UTF-8') . '">' . > _('Delete') . '</a></td>'; > + echo '<td class="noprint"><a href="', > htmlspecialchars($_SERVER['PHP_SELF'], '?SelectedSectionID=', > urlencode($myrow['sectionid']), '&delete=1', ENT_QUOTES, 'UTF-8'), '">', > _('Delete'), '</a></td>'; > } > echo '</tr>'; > } //END WHILE LIST LOOP > echo '</table>'; > +/* echo '</div>';// End div id="Report".*/ > } //end of ifs and buts! > > > -if (isset($_POST['SelectedSectionID']) or > isset($_GET['SelectedSectionID'])) { > +if(isset($_POST['SelectedSectionID']) or > isset($_GET['SelectedSectionID'])) { > echo '<div class="centre"><a href="' . > htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . > _('Review Account Sections') . '</a></div>'; > } > > -if (! isset($_GET['delete'])) { > +if(! isset($_GET['delete'])) { > > - echo '<form method="post" id="AccountSections" action="' . > htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">'; > - echo '<div><br />'; > - echo '<input type="hidden" name="FormID" value="' . > $_SESSION['FormID'] . '" />'; > + echo '<form action="', htmlspecialchars($_SERVER['PHP_SELF'], > ENT_QUOTES, 'UTF-8'), '" id="AccountSections" method="post">'; > + echo '<div class="noprint"><br />'; > + echo '<input name="FormID" type="hidden" value="', > $_SESSION['FormID'], '" />'; > > - if (isset($_GET['SelectedSectionID'])) { > + if(isset($_GET['SelectedSectionID'])) { > //editing an existing section > > $sql = "SELECT sectionid, > @@ -219,7 +225,7 @@ > WHERE sectionid='" . $_GET['SelectedSectionID'] > ."'"; > > $result = DB_query($sql); > - if ( DB_num_rows($result) == 0 ) { > + if( DB_num_rows($result) == 0 ) { > prnMsg( _('Could not retrieve the requested > section please try again.'),'warn'); > unset($_GET['SelectedSectionID']); > } else { > @@ -238,13 +244,13 @@ > > } else { > > - if (!isset($_POST['SelectedSectionID'])){ > + if(!isset($_POST['SelectedSectionID'])) { > $_POST['SelectedSectionID']=''; > } > - if (!isset($_POST['SectionID'])){ > + if(!isset($_POST['SectionID'])) { > $_POST['SectionID']=''; > } > - if (!isset($_POST['SectionName'])) { > + if(!isset($_POST['SectionName'])) { > $_POST['SectionName']=''; > } > echo '<table class="selection"> > > Modified: trunk/doc/Change.log > =================================================================== > --- trunk/doc/Change.log 2015-09-05 22:20:44 UTC (rev 7347) > +++ trunk/doc/Change.log 2015-09-13 17:21:49 UTC (rev 7348) > @@ -1,5 +1,6 @@ > webERP Change Log > > +13/9/15 RChacon: In AccountSections.php, add modifications for direct > printing. > 4/9/15 Wes Wolfenbarger: Fix to Z_ImportStocks.php added quotes to > descriptions - also fixes error message when the csv does not match the > template > 27/08/15 Exson: Fixed the allocation status of involved invoice and > credit notes in Credit_Invoice.php. > 19/08/15 RChacon: In AnalysisHorizontalIncome.php, delete variable > $period because it is not used anywhere (thanks Tim). Extract header.inc > from if. > > > > ------------------------------------------------------------------------------ > _______________________________________________ > Web-erp-svn mailing list > Web...@li... > https://lists.sourceforge.net/lists/listinfo/web-erp-svn > > > > ------------------------------------------------------------------------------ > > _______________________________________________ > Web-erp-developers mailing list > Web...@li... > https://lists.sourceforge.net/lists/listinfo/web-erp-developers > > |
|
From: Rafael C. <raf...@gm...> - 2015-09-13 17:38:16
|
Hi, In this moment, we can not use a sortable table with <thead>, <tbody> and <tfoot>. Also, we can not use the classes "number", "centre" and "text" with class="ascending" without messing up the table sort javascript routine. It is pending to fix this. Best regards, Rafael. ---------- Forwarded message ---------- From: <rc...@us...> Date: 2015-09-13 11:21 GMT-06:00 Subject: [Web-erp-svn] SF.net SVN: web-erp:[7348] trunk To: web...@li... Revision: 7348 http://sourceforge.net/p/web-erp/reponame/7348 Author: rchacon Date: 2015-09-13 17:21:49 +0000 (Sun, 13 Sep 2015) Log Message: ----------- In AccountSections.php, add modifications for direct printing. Modified Paths: -------------- trunk/AccountSections.php trunk/doc/Change.log Modified: trunk/AccountSections.php =================================================================== --- trunk/AccountSections.php 2015-09-05 22:20:44 UTC (rev 7347) +++ trunk/AccountSections.php 2015-09-13 17:21:49 UTC (rev 7348) @@ -1,11 +1,11 @@ <?php /* $Id$*/ +/* Defines the sections in the general ledger reports. */ include('includes/session.inc'); $Title = _('Account Sections'); -/* Manual links before header.inc */ -$ViewTopic = 'GeneralLedger';// Filename in ManualContents.php's TOC. -$BookMark = 'AccountSections';// Anchor's id in the manual's html document. +$ViewTopic = 'GeneralLedger'; +$BookMark = 'AccountSections'; include('includes/header.inc'); // SOME TEST TO ENSURE THAT AT LEAST INCOME AND COST OF SALES ARE THERE @@ -33,13 +33,13 @@ // DONE WITH MINIMUM TESTS -if (isset($Errors)) { +if(isset($Errors)) { unset($Errors); } $Errors = array(); -if (isset($_POST['submit'])) { +if(isset($_POST['submit'])) { //initialise no input errors assumed initially before we test @@ -50,45 +50,45 @@ ie the page has called itself with some user input */ //first off validate inputs sensible - if (isset($_POST['SectionID'])) { + if(isset($_POST['SectionID'])) { $sql="SELECT sectionid FROM accountsection WHERE sectionid='".$_POST['SectionID']."'"; $result=DB_query($sql); - if ((DB_num_rows($result)!=0 AND !isset($_POST['SelectedSectionID']))) { + if((DB_num_rows($result)!=0 AND !isset($_POST['SelectedSectionID']))) { $InputError = 1; prnMsg( _('The account section already exists in the database'),'error'); $Errors[$i] = 'SectionID'; $i++; } } - if (ContainsIllegalCharacters($_POST['SectionName'])) { + if(ContainsIllegalCharacters($_POST['SectionName'])) { $InputError = 1; prnMsg( _('The account section name cannot contain any illegal characters') ,'error'); $Errors[$i] = 'SectionName'; $i++; } - if (mb_strlen($_POST['SectionName'])==0) { + if(mb_strlen($_POST['SectionName'])==0) { $InputError = 1; prnMsg( _('The account section name must contain at least one character') ,'error'); $Errors[$i] = 'SectionName'; $i++; } - if (isset($_POST['SectionID']) AND (!is_numeric($_POST['SectionID']))) { + if(isset($_POST['SectionID']) AND (!is_numeric($_POST['SectionID']))) { $InputError = 1; prnMsg( _('The section number must be an integer'),'error'); $Errors[$i] = 'SectionID'; $i++; } - if (isset($_POST['SectionID']) AND mb_strpos($_POST['SectionID'],".")>0) { + if(isset($_POST['SectionID']) AND mb_strpos($_POST['SectionID'],".")>0) { $InputError = 1; prnMsg( _('The section number must be an integer'),'error'); $Errors[$i] = 'SectionID'; $i++; } - if (isset($_POST['SelectedSectionID']) AND $_POST['SelectedSectionID']!='' AND $InputError !=1) { + if(isset($_POST['SelectedSectionID']) AND $_POST['SelectedSectionID']!='' AND $InputError !=1) { /*SelectedSectionID could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/ @@ -96,7 +96,7 @@ WHERE sectionid = '" . $_POST['SelectedSectionID'] . "'"; $msg = _('Record Updated'); - } elseif ($InputError !=1) { + } elseif($InputError !=1) { /*SelectedSectionID is null cos no item selected on first time round so must be adding a record must be submitting new entries in the new account section form */ @@ -108,7 +108,7 @@ $msg = _('Record inserted'); } - if ($InputError!=1){ + if($InputError!=1) { //run the SQL from either of the above possibilites $result = DB_query($sql); prnMsg($msg,'success'); @@ -117,14 +117,14 @@ unset ($_POST['SectionName']); } -} elseif (isset($_GET['delete'])) { +} elseif(isset($_GET['delete'])) { //the link to delete a selected record was clicked instead of the submit button // PREVENT DELETES IF DEPENDENT RECORDS IN 'accountgroups' $sql= "SELECT COUNT(sectioninaccounts) AS sections FROM accountgroups WHERE sectioninaccounts='" . $_GET['SelectedSectionID'] . "'"; $result = DB_query($sql); $myrow = DB_fetch_array($result); - if ($myrow['sections']>0) { + if($myrow['sections']>0) { prnMsg( _('Cannot delete this account section because general ledger accounts groups have been created using this section'),'warn'); echo '<div>'; echo '<br />' . _('There are') . ' ' . $myrow['sections'] . ' ' . _('general ledger accounts groups that refer to this account section'); @@ -149,7 +149,7 @@ unset ($_POST['SectionName']); } -if (!isset($_GET['SelectedSectionID']) AND !isset($_POST['SelectedSectionID'])) { +if(!isset($_GET['SelectedSectionID']) AND !isset($_POST['SelectedSectionID'])) { /* An account section could be posted when one has been edited and is being updated or GOT when selected for modification @@ -166,19 +166,24 @@ $ErrMsg = _('Could not get account group sections because'); $result = DB_query($sql,$ErrMsg); - echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" />' . ' ' . $Title . '</p><br />'; +/* echo '<div id="Report">';// Division to identify the report block.*/ + echo '<p class="page_title_text"><img alt="" class="noprint" src="', $RootPath, '/css/', $Theme, + '/images/maintenance.png" title="', // Icon image. + _('Account Sections'), '" /> ', // Icon title. + _('Account Sections'), '</p>';// Page title. - echo '<table class="selection"> + echo '<br /> + <table class="selection"> <tr> - <th class="ascending">' . _('Section Number') . '</th> - <th class="ascending">' . _('Section Description') . '</th> - <th colspan="2"> </th> + <th class="ascending">', _('Section Number'), '</th> + <th class="ascending">', _('Section Description'), '</th> + <th class="noprint" colspan="2"> </th> </tr>'; $k=0; //row colour counter while ($myrow = DB_fetch_array($result)) { - if ($k==1){ + if($k==1) { echo '<tr class="EvenTableRows">'; $k=0; } else { @@ -186,31 +191,32 @@ $k++; } - echo '<td class="number">' . $myrow['sectionid'] . '</td> - <td>' . $myrow['sectionname'] . '</td> - <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedSectionID=' . urlencode($myrow['sectionid']), ENT_QUOTES, 'UTF-8') . '">' . _('Edit') . '</a></td>'; - if ( $myrow['sectionid'] == '1' or $myrow['sectionid'] == '2' ) { - echo '<td><b>' . _('Restricted') . '</b></td>'; + echo '<td class="number">', $myrow['sectionid'], '</td> + <td class="text">', $myrow['sectionname'], '</td> + <td class="noprint"><a href="', htmlspecialchars($_SERVER['PHP_SELF'], '?SelectedSectionID=', urlencode($myrow['sectionid']), ENT_QUOTES, 'UTF-8'), '">', _('Edit'), '</a></td>'; + if( $myrow['sectionid'] == '1' or $myrow['sectionid'] == '2' ) { + echo '<td class="noprint"><b>', _('Restricted'), '</b></td>'; } else { - echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedSectionID=' . urlencode($myrow['sectionid']) . '&delete=1', ENT_QUOTES, 'UTF-8') . '">' . _('Delete') . '</a></td>'; + echo '<td class="noprint"><a href="', htmlspecialchars($_SERVER['PHP_SELF'], '?SelectedSectionID=', urlencode($myrow['sectionid']), '&delete=1', ENT_QUOTES, 'UTF-8'), '">', _('Delete'), '</a></td>'; } echo '</tr>'; } //END WHILE LIST LOOP echo '</table>'; +/* echo '</div>';// End div id="Report".*/ } //end of ifs and buts! -if (isset($_POST['SelectedSectionID']) or isset($_GET['SelectedSectionID'])) { +if(isset($_POST['SelectedSectionID']) or isset($_GET['SelectedSectionID'])) { echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('Review Account Sections') . '</a></div>'; } -if (! isset($_GET['delete'])) { +if(! isset($_GET['delete'])) { - echo '<form method="post" id="AccountSections" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">'; - echo '<div><br />'; - echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + echo '<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" id="AccountSections" method="post">'; + echo '<div class="noprint"><br />'; + echo '<input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" />'; - if (isset($_GET['SelectedSectionID'])) { + if(isset($_GET['SelectedSectionID'])) { //editing an existing section $sql = "SELECT sectionid, @@ -219,7 +225,7 @@ WHERE sectionid='" . $_GET['SelectedSectionID'] ."'"; $result = DB_query($sql); - if ( DB_num_rows($result) == 0 ) { + if( DB_num_rows($result) == 0 ) { prnMsg( _('Could not retrieve the requested section please try again.'),'warn'); unset($_GET['SelectedSectionID']); } else { @@ -238,13 +244,13 @@ } else { - if (!isset($_POST['SelectedSectionID'])){ + if(!isset($_POST['SelectedSectionID'])) { $_POST['SelectedSectionID']=''; } - if (!isset($_POST['SectionID'])){ + if(!isset($_POST['SectionID'])) { $_POST['SectionID']=''; } - if (!isset($_POST['SectionName'])) { + if(!isset($_POST['SectionName'])) { $_POST['SectionName']=''; } echo '<table class="selection"> Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2015-09-05 22:20:44 UTC (rev 7347) +++ trunk/doc/Change.log 2015-09-13 17:21:49 UTC (rev 7348) @@ -1,5 +1,6 @@ webERP Change Log +13/9/15 RChacon: In AccountSections.php, add modifications for direct printing. 4/9/15 Wes Wolfenbarger: Fix to Z_ImportStocks.php added quotes to descriptions - also fixes error message when the csv does not match the template 27/08/15 Exson: Fixed the allocation status of involved invoice and credit notes in Credit_Invoice.php. 19/08/15 RChacon: In AnalysisHorizontalIncome.php, delete variable $period because it is not used anywhere (thanks Tim). Extract header.inc from if. ------------------------------------------------------------------------------ _______________________________________________ Web-erp-svn mailing list Web...@li... https://lists.sourceforge.net/lists/listinfo/web-erp-svn |
|
From: Rafael C. <raf...@gm...> - 2015-08-14 13:51:20
|
Hi Ricard, You are welcome. Feel free to tell me any thing that is not clear as it should be (I'm an engineer, not an accountant, and not an native English speaker). Hi Andrew, Thank you, very much. Sorry, it is a copy-paste and spell checker error. Best regards, Rafael. 2015-08-14 6:39 GMT-06:00 Andrew Galuski <aga...@re...>: > This statement doesn’t seem quite right. > > “The purpose of the statement of cash flows is to show whether the company > got their money from and how it was spent during the period being reported > for a user selectable range of periods.” > > Did you mean to say > > “The purpose of the statement of cash flows is to show where the company > got their money from and how it was spent during the period being reported > for a user selectable range of periods.” > > > > > > Best Regards, > > Andrew Galuski > > ResMart LLC. > > 817.615.2038 (Office) > > 817.821.0544 (Cell) > > www.resmart.com > > [image: resmart_logo] > > > > *From:* Rafael Chacón [mailto:raf...@gm...] > *Sent:* Thursday, August 13, 2015 8:51 PM > > *To:* webERP Developers > *Subject:* Re: [WebERP-developers] AnalysisHorizontalPosition.php > > > > Hi, > > > > I added info to doc/ManualGeneralLedger.html for the horizontal analysis, > but also for the next statements. I will appreciate if you can review the > document. Reading those reports is not very easy, I am looking for a clear > explanation. > > > > Best regards, Rafael. > > > > 2015-08-13 9:39 GMT-06:00 Andrew Galuski <aga...@re...>: > > Reall6y looking forward to “statement of cash flows” > > > > > > Best Regards, > > Andrew Galuski > > ResMart LLC. > > 817.615.2038 (Office) > > 817.821.0544 (Cell) > > www.resmart.com > > [image: resmart_logo] > > > > *From:* Rafael Chacón [mailto:raf...@gm...] > *Sent:* Thursday, August 13, 2015 9:18 AM > *To:* webERP Developers > *Subject:* Re: [WebERP-developers] AnalysisHorizontalPosition.php > > > > > *** See > http://unstable.verdorama.systems/downloads/AnalysisHorizontalIncome%20%282015-08-04%29.zip > for attachment *** > > Best regards, Rafael. > > ---------- > > 2015-08-13 8:01 GMT-06:00 Rafael Chacón <raf...@gm...>: > > Hi Ricard, > > 1) New script instead of to modify GLBalanceSheet.php script: > Two "local" reasons: > (a) Here, we plan to have a set of horizontal analysis (for statement of > financial position, for statement of comprehensive income, for statement of > changes in equity, and for statement of cash flows). A script to generate > from one to all of them. The first step is to have a script for each > horizontal analysis; the second is to create a script to select the > horizontal analysis to generate (a “master” script) and to modify previous > scripts (make them as “subroutine” scripts). Obviously, we have also to > create scripts for a statement of changes in equity, and for statement of > cash flows. > (b) there are different users between > GLBalanceSheet/AnalysisHorizontalPosition and > GLProfit_Loss/AnalysisHorizontalIncome. Each addressee wants to see some > columns and others do not. This involves to turn on/off some columns. We do > not want to complicate these scripts (especially the formatting). > > 2) On the % of variation, some attention to signs must be improved: > Yes, we are including a footnote to explain: (a) meaning of signs in > Absolute variation; and (b) meaning of signs in Relative variation. > In case of the Horizontal Analysis of Statement of Comprehensive Income, > it is easy to understand: (*) positive absolute variation = increases the > Net Profit; negative = decreases. (**) positive relative variation = the > amount of the account increases; negative = decreases. > > I enclose AnalysisHorizontalPosition.php, if you want to test it and > comment it. > I warn you that this script does NOT have sections 1 and 2 (I'm fixing > this). This “bug” occurred because we overwrite sections 1 and 2 (we use a > section for “Gross profit” with an income and a cost groups). > > Best regards, Rafael. > > > > 2015-08-11 19:50 GMT-06:00 Pak Ricard <pak...@gm...>: > > Hi Rafael: > > > > I've been playing with your new AnalysisHorizontalPosition.php script and > looks very good. Thanks for sharing it! > > > > Just 2 questions: > > > > 1) Why don't modify directly the GLBalanceSheet.php script, so the > variation column and % column are shown always in the BS? Like this we > should only maintain 1 script not 2 very similar. (I'm lazy, so that's why > I always look for reduction of code lines to maintain). > > > > 2) On the % of variation, some attention to signs must be improved. I'm > not accountant so not sure if I'm right or not. > > > > Take the example below of a bank account. Last year we had -705.000 IDR > (we owed the bank) and this year 4.745.000 IDR. The variation in IDR is > right, but I dare say that the bank account increased by +773%, not - > > > > 1212121212 > > Cash bank IDR > > 4,745,000 > > -705,000 > > 5,450,000 > > -773% > > > > but if the variation had been on the other side (from + last year to - > this year), it would be correct to use the - sign). Also I guess it should > be opposite for liabilities. > > > > Regards, > Ricard > > > > > ------------------------------------------------------------------------------ > > _______________________________________________ > Web-erp-developers mailing list > Web...@li... > https://lists.sourceforge.net/lists/listinfo/web-erp-developers > > > > > > > > ------------------------------------------------------------------------------ > > _______________________________________________ > Web-erp-developers mailing list > Web...@li... > https://lists.sourceforge.net/lists/listinfo/web-erp-developers > > > > > ------------------------------------------------------------------------------ > > _______________________________________________ > Web-erp-developers mailing list > Web...@li... > https://lists.sourceforge.net/lists/listinfo/web-erp-developers > > |
231 messages has been excluded from this view by a project administrator.
