Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-07 17:42:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
70,692 Commits 37 Branches 191 Tags
5daf095fc60f5bbed9fdbb3cdec8db4e109f7869
Commit Graph

482 Commits

Author SHA1 Message Date
Frédéric FRANCE
d9d346aab2 Update pdf_sponge.modules.php 2018-10-24 08:22:17 +02:00
Laurent Destailleur
0f48cc1d0f Merge branch 'develop' into fixpdf 2018-10-24 03:01:52 +02:00
John BOTELLA
d9965d1986 Fix travis messages 2018-10-23 17:18:30 +02:00
Frédéric FRANCE
570ee200d8 Merge remote-tracking branch 'upstream/develop' into fixpdf 2018-10-22 20:19:28 +02:00
Laurent Destailleur
f65df9e541 NEW Add option PDF_DISABLE_MYCOMPANY_LOGO to disable logo on PDF 2018-10-22 20:06:03 +02:00
Frédéric FRANCE
042118fe38 fix it 2018-10-19 18:35:16 +02:00
Frédéric FRANCE
c811d5a371 fix new pdf 2018-10-19 18:20:06 +02:00
Laurent Destailleur
fecb6e49c6 Merge pull request #9014 from atm-john/NEW_PDF_DOCUMENT_COLUMN_new_files 
Experimental new pdf documents  using new column system
 2018-10-19 15:51:54 +02:00
Philippe Grand
b7304e3d82 Merge branch 'develop' into new_branch_21_09_2018 2018-09-27 09:29:26 +02:00
Philippe GRAND
2799bd175d Translated comment 2018-09-23 21:35:43 +02:00
Philippe Grand
d5003c9d3c Merge branch 'develop' into new_branch_21_09_2018 2018-09-21 13:55:04 +02:00
Philippe Grand
239be3b58c Merge branch 'develop' into new_branch_20_09_2018 2018-09-21 10:12:48 +02:00
Laurent Destailleur
8cfe5d7252 Merge pull request #9569 from grandoc/new_branch_19_09_2018 
Missing translation
 2018-09-21 09:50:18 +02:00
Philippe GRAND
bde8d8ae0e Comment and typo 2018-09-21 09:32:50 +02:00
Philippe GRAND
f59ac8dda5 Merge remote-tracking branch 'origin/new_branch_20_09_2018' into new_branch_21_09_2018 2018-09-21 09:07:17 +02:00
Laurent Destailleur
5bd538fb2c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/modules/modStripe.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/element.php
 2018-09-20 23:43:34 +02:00
Philippe GRAND
11f254cd14 Standardize and update code 2018-09-20 14:19:52 +02:00
Philippe GRAND
a14c520910 Standardize and update code 2018-09-20 13:41:26 +02:00
Philippe GRAND
1adc4bad9e Standardize and update code 2018-09-20 09:17:25 +02:00
Philippe GRAND
06ad6e7196 Standardize and update code 2018-09-20 09:04:12 +02:00
Philippe GRAND
ad84340bf5 Standardize and update code 2018-09-20 09:03:26 +02:00
Philippe GRAND
bd3ba04e24 Standardize and update code 2018-09-19 16:36:08 +02:00
Philippe GRAND
30e426e487 Standardize and update code 2018-09-19 16:21:52 +02:00
Laurent Destailleur
824b572bd0 FIX Amount when using mutlicurrency on PDF 
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	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
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2018-09-19 15:03:24 +02:00
Laurent Destailleur
2b67da3f34 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
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
 2018-09-19 14:52:43 +02:00
Frédéric FRANCE
cdbb79a26c correct typo in multicurrency doc pdf 2018-09-19 09:26:56 +02:00
Philippe GRAND
b4692f0812 fix merge 2018-09-18 16:45:06 +02:00
Philippe GRAND
c08f443f0a Standardize and update code 2018-09-18 11:09:56 +02:00
Philippe GRAND
ca9b1f155f Standardize and update code 2018-09-14 14:05:19 +02:00
John BOTELLA
d1321e5a7b change new PDF version 2018-09-14 09:54:39 +02:00
John BOTELLA
ec23cd0da4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_PDF_DOCUMENT_COLUMN_new_files 2018-09-14 09:54:14 +02:00
Frédéric FRANCE
4cbfa2073a Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-05 21:02:16 +02:00
Frédéric FRANCE
85df267a5b move phpcs:ignore 2018-09-05 20:36:44 +02:00
Laurent Destailleur
4ac67e6409 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-05 20:31:10 +02:00
Laurent Destailleur
3650dc3ec9 FIX #8452 2018-09-05 15:25:47 +02:00
Frédéric FRANCE
fd6281b364 move phpcs:ignore 2018-09-04 20:00:09 +02:00
Frédéric FRANCE
5f4a922c1d move phpcs:ignore 2018-09-03 19:00:37 +02:00
Frédéric FRANCE
57fb3dc2f4 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Frédéric FRANCE
6aee680a4f PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
fe4260a014 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Frédéric FRANCE
6b6daf178f Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Laurent Destailleur
85eed6cf80 Merge branch 'develop' into trimtrailing 2018-08-21 13:40:04 +02:00
Philippe GRAND
edb566501d Update and standardize code 2018-08-17 18:54:41 +02:00
Frédéric FRANCE
850ac34020 mark non camelCaps function 2018-08-13 17:26:32 +02:00
Laurent Destailleur
dc8c4402ee Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:22 +02:00
Frédéric FRANCE
6f74ecceaf Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 18:21:59 +02:00
Laurent Destailleur
61d7629ab1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
 2018-08-08 17:44:22 +02:00
Laurent Destailleur
8d54df4263 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
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
 2018-08-08 17:31:23 +02:00
Ferran Marcet
5ce31f65a4 Fix: Bad position when document have incoterms/notes 2018-08-07 11:40:11 +02:00