Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 17:48:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
69,068 Commits 36 Branches 190 Tags
cefaeb583ff12ad09c836fcbf6b39d01209e901b
Commit Graph

76 Commits

Author SHA1 Message Date
Laurent Destailleur
4b7f373802 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-18 21:37:34 +01:00
Laurent Destailleur
fb8c3f01a4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/modules/project/doc/pdf_baleine.modules.php
	htdocs/core/modules/project/doc/pdf_beluga.modules.php
 2018-12-18 21:35:30 +01:00
Maxime Kohlhaas
8fea6338e1 Fix #6565 
Fix pdf footer height for all documents
 2018-12-02 18:51:49 +01:00
Marc de Lima Lucio
dc951029cd Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_pdf_note_incoterm 2018-06-20 10:31:35 +02:00
Marc de Lima Lucio
babc99465c FIX PR #8841 2018-06-20 10:22:43 +02:00
Marc de Lima Lucio
9fa9a716d5 FIX: pdf: overlap when linked elements and incoterms/public note displayed + port PR #8155 into supplier docs & contracts 2018-06-20 10:22:43 +02:00
Laurent Destailleur
8d1456fb7f Merge pull request #8949 from atm-greg/Manage_product_units_in_supplier_proposal 
add product units management in supplier proposal documents
 2018-06-13 21:41:39 +02:00
atm-greg
d14f40f722 add product units management in supplier proposal documents 2018-06-12 14:36:32 +02:00
Laurent Destailleur
fa252d5cbd Merge branch 'develop' into FIX_6.0_pdf_note_incoterm 2018-05-25 11:59:22 +02:00
Marc de Lima Lucio
111f3a9649 FIX: pdf: overlap when linked elements and incoterms/public note displayed + port PR #8155 into supplier docs & contracts 2018-05-23 11:11:33 +02:00
Laurent Destailleur
55f982e504 Removed deprecated FPDI option and reorganise PDF setup page 2018-04-30 09:28:24 +02:00
Philippe GRAND
5b1efc2227 New [*use loadLangs for translation files*] and update code 2018-03-27 19:30:31 +02:00
Philippe GRAND
743a61159d use loadLangs for translation files 2018-03-14 19:34:33 +01:00
Frédéric FRANCE
c76dce64d3 add object in pdf_build_address source 2018-03-13 12:15:03 +01:00
Laurent Destailleur
38d1fc27e0 Start to introduce common substitution rules for odt substitutions 2018-02-24 13:41:01 +01:00
Laurent Destailleur
cbfe241c1b FIX Can use odx templates that does not include lines tags 2018-02-24 12:34:15 +01:00
Laurent Destailleur
daeebae647 FIX Can use odx templates that does not include lines tags 2018-02-24 12:32:48 +01:00
Laurent Destailleur
c03ceb2205 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-12 02:56:51 +01: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
3987033aab Fix substitution in public notes of pdf 2018-01-21 20:53:36 +01:00
KHELIFA
d069ccdb7f Core Modele PDF: Fix globale variable for hide payment mode with PROPALE_PDF_HIDE_PAYMENTTERMMODE and SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE 
- Fix hide payment condition for supplier proposal
 2017-12-21 16:58:37 +01:00
Laurent Destailleur
3c9532841f Fix regression db => this->db 2017-09-15 19:37:23 +02:00
Laurent Destailleur
5e34b121dd Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
Laurent Destailleur
4b9f54e571 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/data/llx_accounting.sql
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
	htdocs/install/mysql/tables/llx_holiday_config.sql
 2017-09-01 17:34:57 +02:00
Laurent Destailleur
7218a9de0e Fix translation of total VAT 2017-08-29 13:52:24 +02:00
Laurent Destailleur
260beed512 NEW Generated files are now indexed in database 2017-08-18 23:19:55 +02:00
fappels
7fc359df5d Fix pic position when VAT column hidden 2017-08-07 21:48:01 +02:00
fappels
ea5dcbf611 Fix constant to show pics and remove pics column line 2017-08-07 21:35:30 +02:00
Laurent Destailleur
252d8da8fc Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2017-07-07 15:11:53 +02:00
Maxime Kohlhaas
cef5c0b375 Fix column position in PDF when VAT is hidden 2017-06-28 00:38:24 +02:00
Laurent Destailleur
ba3a74576c Merge 5.0 2017-06-12 18:22:51 +02:00
atm-ph
0d24df9ffc Fix 6939 new path for pictures is not used 2017-06-10 14:40:17 +02:00
Laurent Destailleur
d60e98a797 No payment information on a supplier proposal by default. 2017-05-05 13:50:14 +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
Laurent Destailleur
70091eceed Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2017-01-27 01:26:11 +01:00
Ferran Marcet
0df39149c4 Fix: Hidden option not showing correctly 2017-01-25 19:28:20 +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
a07a77e323 Not yet ready for php 7.1 2017-01-16 01:11:38 +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
0debcf745a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/cron/card.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
 2016-09-09 09:32:14 +02:00
Laurent Destailleur
417b2f566f FIX Translation of "Name" is not a good choice for floow-up. 2016-09-08 17:31:42 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
 2016-08-01 15:15:32 +02:00
Laurent Destailleur
49258db58d NEW Option DOC_SHOW_FIRST_SALES_REP shows name of buyer or saler on PDF. 2016-08-01 14:20:41 +02:00
Laurent Destailleur
45d354ad82 Fix variable names MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN... 2016-07-29 22:58:39 +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