Commit Graph

80 Commits

Author SHA1 Message Date
Laurent Destailleur
e5a945ba5b Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	ChangeLog
	htdocs/admin/propal.php
	htdocs/compta/journal/purchasesjournal.php
	htdocs/compta/journal/sellsjournal.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/modules/mailings/contacts2.modules.php
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/en_US/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/public/demo/index.php
2013-04-14 01:46:33 +02:00
Laurent Destailleur
8e3f0172fc Fix: Fix tons of pb with num ref system of supplier invoices. 2013-04-12 00:00:31 +02:00
Marcos García
6252857440 Fixed translations and BILL_SUPPLIER_BUILDDOC trigger 2013-04-06 17:56:10 +02:00
Laurent Destailleur
bf912e2c78 Fix: Some bug into supplier pdf invoice setup. 2013-03-19 15:19:31 +01:00
Grand Philippe
86dff79b73 try to fix : cannot display numbering models 2013-03-16 16:58:45 +01:00
Grand Philippe
7dbc782d42 prepair numbering models for supplier invoices 2013-03-15 19:03:07 +01:00
Grand Philippe
e46900ad84 prepair numbering models for supplier invoices 2013-03-15 18:40:31 +01:00
Grand Philippe
8f7c629d9c prepair numbering models for supplier invoices 2013-03-15 17:45:25 +01:00
Grand Philippe
a9eed57e27 prepair numbering models for supplier invoices 2013-03-15 16:43:28 +01:00
Grand Philippe
b0bce23595 prepair numbering models for supplier invoices 2013-03-15 16:16:38 +01:00
Laurent Destailleur
e97ca67c4a Fix: Several problem with localtax into PDF generation
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
2013-03-07 19:13:50 +01:00
Laurent Destailleur
c762c93eb1 Fix: Several problem with localtax into PDF generation 2013-03-07 12:04:12 +01:00
Grand Philippe
b081589129 english language standardization 2013-02-25 09:52:24 +01:00
Laurent Destailleur
7d1c51ab77 Add option MAIN_PDF_TITLE_BACKGROUND_COLOR 2013-02-13 16:45:53 +01:00
Regis Houssin
fcee35c65d Fix: $hookmanager is a global object 2013-01-26 10:35:30 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
5e05e0aa55 Fix: Trigger names 2012-12-29 17:34:52 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50
commits !
2012-12-01 15:45:05 +01:00
Laurent Destailleur
59a305f6f1 New: no dash line if last item. 2012-11-21 20:35:51 +01:00
Laurent Destailleur
1f263943c5 New: Add option to add slashes lines between lines into PDF. 2012-11-21 19:07:03 +01:00
Regis Houssin
8908f977b8 Fix: converting line delimiters !!! 2012-11-14 11:31:08 +01:00
Laurent Destailleur
19c617e4a0 Fix: Solve double ";;" 2012-11-03 13:49:31 +01:00
Laurent Destailleur
0c7af5c8a0 Fix: Not enought space for free text. To avoid to edit again and again
value for all templates, I added an option to be able to fix template
onto production when space is not enough.
2012-11-03 13:32:37 +01:00
Laurent Destailleur
f8a9733b73 Again 2 pixels missings 2012-11-03 00:37:10 +01:00
Laurent Destailleur
13ef8491b7 Fix: Error management 2012-10-31 15:09:42 +01:00
Laurent Destailleur
f6d9b2abe3 New: Add hidden option MAIN_PDF_MARGIN_LEFT, MAIN_PDF_MARGIN_RIGHT,
MAIN_PDF_MARGIN_TOP, MAIN_PDF_MARGIN_BOTTOM to force margins of
generated PDF.
Qual: Use 2 different var for reserver footer height and free text
height.
2012-10-31 13:48:59 +01:00
Laurent Destailleur
ea90571925 Fix: The bottom margin is already included into heightforfooter
This provide 1cm more for product description.
2012-10-30 17:57:32 +01:00
Laurent Destailleur
6f9c9fcd55 Fix: Free text overlap data when not on last page. 2012-10-30 13:11:17 +01:00
Regis Houssin
b952a7f9bf Fix: convert line delimiters (use the last eclipse version) 2012-10-28 13:57:21 +01:00
Regis Houssin
9d95e8bffb Fix: missing hookmanager 2012-10-25 11:44:04 +02:00
Laurent Destailleur
fbb3ce63a7 Fix: PDF works with US executive format. 2012-10-21 15:50:53 +02:00
Laurent Destailleur
6046feda11 Restore border into PDF 2012-10-11 09:42:47 +02:00
Laurent Destailleur
bdb7becbc6 Fix: Try another fix on getTrad bug. 2012-10-04 09:44:04 +02:00
Regis Houssin
d58c106f66 Fix: convert line delimiters !!! 2012-09-19 17:53:09 +02:00
Laurent Destailleur
a68483d72f Uniformize code. 2012-09-19 14:49:13 +02:00
Laurent Destailleur
889f71db6f Fix: Color of lines must be set for each lines 2012-09-18 12:52:54 +02:00
Regis Houssin
8bab5fdadd Fix: convert line delimiters 2012-09-17 19:37:02 +02:00
Laurent Destailleur
2170801fd2 New: Uniformize pdf generation code. We also keep space to repeat pdf
head info.
2012-09-17 00:43:23 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Regis Houssin
be13602c71 Fix: use getDocumentsLink method 2012-09-15 09:02:20 +02:00
Laurent Destailleur
1c91027a4e Fix: Uniformize pdf code. Try to solve offset when a product line is
moved onto next page.
2012-09-11 14:03:16 +02:00
Regis Houssin
ee1cf819f7 Fix: mass convert line delimiters 2012-09-07 17:23:16 +02:00
Laurent Destailleur
aea89389e8 Qual: Uniformize pdf templates
Qual: Removed duplicate pdf templates when content with no technology
difference nor functionnal difference
2012-09-04 20:04:38 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
3438305169 FIXME: with ajax autocompleter, does not see the products that have no
supplier prices because they can be selected and it creates an error
message.
Fix: Do not make a "print" on "hook methods", just get the result
2012-08-17 15:16:07 +02:00
Laurent Destailleur
54c6db5b81 Qual: Uniformize code for pdf generation.
Refactoring of pdf code to make code cleaner and fix a lot of bug into
page breaks.
2012-08-08 04:12:20 +02:00
FHenry
07fc51b7ff Remove Eclipse variable warning 2012-04-20 15:54:37 +02:00
Laurent Destailleur
334adf7ae2 Fix: Bad CR for public note. Must work when text is full text with \n
and also when text is HTML with br.
2012-04-20 13:54:57 +02:00