Commit Graph

191 Commits

Author SHA1 Message Date
Frédéric FRANCE
cdbb79a26c
correct typo in multicurrency doc pdf 2018-09-19 09:26:56 +02:00
atm-greg
90f1ab8af4 add hooks on supplier documents 2018-04-16 06:46:22 +02:00
atm-greg
ae34fa6fbd add supplier contact name on supplier documents 2018-04-11 17:42:26 +02:00
atm-ph
b074f580db Fix can't update $nblignes on beforePDFCreation if we update $object->lines 2018-02-08 16:59:17 +01:00
Laurent Destailleur
60078300b8 FIX PDF output was sharing 2 different currencies in same total 2017-09-13 17:57:41 +02:00
Laurent Destailleur
d96a83adac Fix bad total included tax when mutlicurrency is on 2017-08-29 16:37:00 +02:00
Laurent Destailleur
7218a9de0e Fix translation of total VAT 2017-08-29 13:52:24 +02:00
Laurent Destailleur
efe5d79a86 Work on #6958. Only one type of invoice supported for supplier invoices 2017-06-20 12:58:43 +02:00
Laurent Destailleur
3adb43c6e5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/boxes/box_produits.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/langs/en_US/bills.lang
	htdocs/product/class/product.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
2017-03-23 12:52:19 +01:00
Laurent Destailleur
7df9c25e60 Several fixes on multicurrency 2017-03-23 12:44:20 +01:00
Laurent Destailleur
ac19aba07e FIX multicurrency management on supplier order/invoice
Conflicts:
	htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
2017-03-19 15:41:55 +01:00
Laurent Destailleur
e85206dee5 FIX multicurrency management on supplier order/invoice 2017-03-19 15:37:07 +01:00
Marcos García de La Fuente
8225b06018 NEW Removed commande_pdf_create, contract_pdf_create,expedition_pdf_create, facture_pdf_create, delivery_order_pdf_create, task_pdf_create, project_pdf_create, propale_pdf_create, supplier_invoice_pdf_create, supplier_order_pdf_create, supplier_proposal_pdf_create deprecated functions 2017-01-16 21:59:02 +01:00
Laurent Destailleur
c635baa848 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/langs/en_US/errors.lang
2017-01-03 01:34:15 +01:00
Laurent Destailleur
157b17b6d5 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/errors.lang
2017-01-03 01:31:58 +01:00
Marcos García de La Fuente
98599b0bbf FIX #6227 Document models table header "Unit" is shown in 2 lines in Spanish 2016-12-27 12:56:49 +01:00
Laurent Destailleur
bbd3734a21 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
2016-12-26 12:42:23 +01:00
Laurent Destailleur
8ce5ed0192 Fix position of discount on PDF with US letter format 2016-12-23 15:57:31 +01:00
Laurent Destailleur
fe1c83b206 Fix code not reachable 2016-11-13 18:15:31 +01:00
aspangaro
c65678d00a Update cactus numbering model 2016-11-11 07:36:26 +01:00
aspangaro
60219fa84d Update tulip model 2016-11-11 07:06:45 +01:00
Laurent Destailleur
c4dd689b08 Clean unreachable code 2016-10-21 11:53:41 +02:00
Sergio Sanchis Climent
227c6906a8 FIX #5516 2016-07-26 23:26:29 +02:00
Laurent Destailleur
56e374ff0d Fix remove warnings 2016-07-07 15:41:11 +02:00
Laurent Destailleur
fe86ef5774 Thirdparty into keyword, encoded with convToOutputCharset 2016-07-02 17:00:45 +02:00
Maxime Kohlhaas
651213123f Oups missing $conf 2016-04-23 17:45:38 +02:00
Maxime Kohlhaas
930b4a9be0 New var name 2016-04-23 17:36:55 +02:00
Maxime Kohlhaas
ad26fb2824 New option to show details in pdf page foot 2016-04-23 17:23:44 +02:00
Marcos García de La Fuente
e2c86d3fd8 NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead 2016-04-17 15:24:22 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
26de415b77 Revert commit that break compatibility of 100% of modules 2016-03-25 15:24:57 +01:00
Laurent Destailleur
54ac3c0a7b Fix regression 2016-03-22 17:41:42 +01:00
Marcos García de La Fuente
4d78932fe8 NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions 2016-03-20 14:15:21 +01:00
Laurent Destailleur
54034ea852 NEW Add $object in parameter of pdf_build_address so we could include
hook into the function.
2016-02-25 18:30:31 +01:00
philippe grand
7b7f2e9fed translations 2016-01-07 10:07:05 +01:00
Laurent Destailleur
f25a9030eb Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	.travis.yml
	htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
	htdocs/core/modules/commande/doc/pdf_proforma.modules.php
	htdocs/includes/adodbtime/adodb-time.inc.php
	htdocs/langs/en_US/accountancy.lang
2015-12-18 22:12:03 +01:00
Laurent Destailleur
dd3f5a32d3 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	.travis.yml
	composer.json
	htdocs/accountancy/admin/card.php
2015-12-18 21:20:12 +01:00
Laurent Destailleur
ebf68ecbe0 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	.travis.yml
	htdocs/contrat/class/contrat.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/project/pdf/pdf_baleine.modules.php
2015-12-18 21:03:57 +01:00
Raphaël Doursenaud
e6ec797af8 FIX #4242 Allow disabling dashes in documents 2015-12-17 10:21:44 +01:00
Laurent Destailleur
0330d8237f Fix: Color too dark 2015-12-12 14:13:45 +01:00
Laurent Destailleur
61b46352b7 Dash line was not visible. 2015-11-23 09:36:34 +01:00
Laurent Destailleur
d19ec89bf1 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/core/modules/modHoliday.class.php
	htdocs/holiday/card.php
2015-09-03 23:27:47 +02:00
Marcos García de La Fuente
3134950dbe FIX [ bug #3383 ] Company name is overlapped with company direction in PDF models
Close #3383
2015-09-01 11:19:05 +02:00
Juanjo Menent
05b0a9b675 Merge remote-tracking branch 'origin/3.7' into 3.8
# Conflicts:
#	htdocs/core/menus/standard/eldy.lib.php
2015-08-01 14:50:07 +02:00
Laurent Destailleur
13dee1876a Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/compta/resultat/clientfourn.php
2015-07-30 15:07:22 +02:00
fmarcet
6676114501 Fix: Not showing product supplier reference when page break 2015-07-27 16:31:40 +02:00
Marcos García de La Fuente
460a2ec2ab Merge branch 'develop' into commercial-name
Conflicts:
	htdocs/categories/categorie.php
	htdocs/comm/prospect/list.php
2015-05-25 15:09:46 +02:00
Laurent Destailleur
a258370f8a Prepare code for generic solution where all path are forged using
get_exdir.
2015-05-18 22:25:51 +02:00
Marcos García de La Fuente
ce7ed70d74 Merge branch 'develop' into commercial-name
Conflicts:
	htdocs/comm/prospect/list.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
2015-05-10 12:23:07 +02:00
Marcos García de La Fuente
7be7a770c1 Implemented units for CommandeFournisseur and FactureFournisseur 2015-04-19 16:46:24 +02:00