Alexandre SPANGARO
|
16c6c9ae75
|
Merge remote-tracking branch 'upstream/develop' into 11.0_https
|
2019-10-01 06:12:24 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Laurent Destailleur
|
0846a081cb
|
Merge branch 'develop' into new_branch_29_06_2019
|
2019-09-30 21:06:51 +02:00 |
|
Laurent Destailleur
|
138b494b98
|
Merge pull request #11936 from aspangaro/11.0_translation
Translate and some fix
|
2019-09-27 12:15:50 +02:00 |
|
Philippe GRAND
|
7ec43e8b59
|
add missing translation
|
2019-09-24 09:54:57 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Alexandre SPANGARO
|
1e49fd0d45
|
Translate
|
2019-09-20 15:07:58 +02:00 |
|
Alexandre SPANGARO
|
e32772fdc5
|
Translate
|
2019-09-20 09:44:49 +02:00 |
|
Alexandre SPANGARO
|
278312f38f
|
Translate
|
2019-09-20 07:02:14 +02:00 |
|
stickler-ci
|
017a0fb70f
|
Fixing style errors.
|
2019-09-10 19:42:31 +00:00 |
|
Philippe GRAND
|
6634ef4de5
|
Merge remote-tracking branch 'origin/develop' into new_branch_29_06_2019
|
2019-09-10 21:40:04 +02:00 |
|
Alexandre SPANGARO
|
3ddd123eb1
|
Traduction
|
2019-09-08 05:18:52 +02:00 |
|
Alexandre SPANGARO
|
d9fa32b555
|
Traduction
|
2019-09-08 05:00:24 +02:00 |
|
Laurent Destailleur
|
8874a0f3c1
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-15 23:39:11 +02:00 |
|
Laurent Destailleur
|
386f929fe3
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/lib/website.lib.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
|
2019-08-15 23:39:02 +02:00 |
|
Ferran Marcet
|
f1c0442a77
|
FIX: Add comment before protected functions
|
2019-08-12 10:16:04 +02:00 |
|
Ferran Marcet
|
fd1204bcd2
|
FIX: Make protected all pfd models functions
|
2019-08-05 13:41:25 +02:00 |
|
Regis Houssin
|
cbda42d146
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-07-19 09:37:34 +02:00 |
|
Laurent Destailleur
|
adb3062a9f
|
Work on nblignes -> nblines
|
2019-06-29 16:38:14 +02:00 |
|
Philippe GRAND
|
bebd219e5a
|
translations
|
2019-06-29 10:30:26 +02:00 |
|
Philippe GRAND
|
bd43e90c2b
|
translations
|
2019-06-29 10:28:29 +02:00 |
|
Regis Houssin
|
156b25a702
|
FIX use "multidir_output" instead "dir_output"
|
2019-05-12 16:36:29 +02:00 |
|
Laurent Destailleur
|
6e69db8a1a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/product/doc/pdf_standard.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
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
htdocs/filefunc.inc.php
|
2019-05-09 12:27:14 +02:00 |
|
Laurent Destailleur
|
f1fd4108ae
|
Debug/Clean code
|
2019-05-09 12:17:20 +02:00 |
|
Laurent Destailleur
|
d3bbb93ada
|
Fix template for situation
Conflicts:
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
|
2019-05-09 12:16:43 +02:00 |
|
Frédéric FRANCE
|
315349a681
|
replace @public by @var
|
2019-04-18 18:41:02 +02:00 |
|
Laurent Destailleur
|
b5bf6830e9
|
Introduce method convertBackOfficeMediasLinksToPublicLinks so links to
media added from filemanager in notes are visible by PDFs builder.
|
2019-04-17 01:13:59 +02:00 |
|
Philippe GRAND
|
edd5661f1a
|
update code
|
2019-04-09 09:31:33 +02:00 |
|
Laurent Destailleur
|
976ef92df6
|
Merge pull request #10958 from atm-john/new_look_and_feel_pdf
New pdf document column system : supplier order and expedition
|
2019-04-08 13:31:47 +02:00 |
|
John BOTELLA
|
a668cc28b1
|
Add table title auto height
|
2019-04-03 16:19:49 +02:00 |
|
Laurent Destailleur
|
76bf412f95
|
Fix phpcs
|
2019-04-03 14:40:15 +02:00 |
|
Philippe GRAND
|
2c41610ac8
|
update comments
|
2019-04-01 09:21:08 +02:00 |
|
Philippe GRAND
|
f13d520830
|
update with html5 compliant code
|
2019-03-14 14:30:41 +01:00 |
|
Frédéric FRANCE
|
7e31ca48d8
|
add visibility
|
2019-02-28 22:07:48 +01:00 |
|
Frédéric FRANCE
|
e6c3eb0ba1
|
wip
|
2019-02-26 21:13:07 +01:00 |
|
Frédéric FRANCE
|
e7706192b5
|
doc comment
|
2019-02-24 10:08:42 +01:00 |
|
Frédéric FRANCE
|
152d8ffcbf
|
Merge remote-tracking branch 'upstream/develop' into GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-10 11:08:59 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Laurent Destailleur
|
7625eb7cd4
|
Fix missing error management after afterPDFCreation hook.
Removed dead code
|
2019-02-08 19:54:24 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Laurent Destailleur
|
a6dde3d6bd
|
Merge branch 'develop' into nospaceaftercomma
|
2019-02-03 19:27:16 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Frédéric FRANCE
|
03701fa091
|
psr2
|
2019-02-02 18:25:01 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Laurent Destailleur
|
44a6644969
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-12-18 21:55:53 +01:00 |
|
Laurent Destailleur
|
89068ffef1
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/adherents/subscription.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/langs/es_ES/companies.lang
htdocs/langs/es_ES/errors.lang
htdocs/product/stock/product.php
htdocs/user/card.php
|
2018-12-18 21:55:14 +01:00 |
|
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 |
|
Laurent Destailleur
|
dbc85b42ba
|
Fix phpcs
|
2018-12-15 13:58:39 +01:00 |
|
Maxime Kohlhaas
|
8fea6338e1
|
Fix #6565
Fix pdf footer height for all documents
|
2018-12-02 18:51:49 +01:00 |
|
Regis Houssin
|
874e27ef84
|
FIX multicompany override constants of current entity
|
2018-11-14 15:37:10 +01:00 |
|
Regis Houssin
|
04edcaa89c
|
FIX compatibility between proposal sharing and proposalnumber sharing
|
2018-11-13 20:20:46 +01:00 |
|
Regis Houssin
|
89389baeac
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
|
2018-11-09 15:37:29 +01:00 |
|
Laurent Destailleur
|
67fbb3dbb6
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/class/notify.class.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
|
2018-11-03 19:15:52 +01:00 |
|
Laurent Destailleur
|
be8e48b265
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
|
2018-10-31 15:38:29 +01:00 |
|
Laurent Destailleur
|
ca726e6c94
|
FIX Error generating ODT when option to use contact on doc on
|
2018-10-31 15:31:22 +01:00 |
|
Regis Houssin
|
9589f69574
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_email
Conflicts:
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
|
2018-10-30 18:29:28 +01:00 |
|
Regis Houssin
|
569d59d251
|
FIX change my deprecated email
|
2018-10-27 14:43:12 +02:00 |
|
Frédéric FRANCE
|
b80d2fa12d
|
fill empty catch with log
|
2018-10-26 21:09:46 +02:00 |
|
Frédéric FRANCE
|
86d854f3f4
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-24 23:04:26 +02:00 |
|
Frédéric FRANCE
|
2bc208675f
|
Update pdf_cyan.modules.php
|
2018-10-24 09:06:54 +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
|
2799bd175d
|
Translated comment
|
2018-09-23 21:35:43 +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 |
|
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
|
2adfdab771
|
Standardize and update code
|
2018-09-20 15:14:59 +02:00 |
|
Philippe GRAND
|
7903a64c36
|
Standardize and update code
|
2018-09-20 14:23:09 +02:00 |
|
Philippe GRAND
|
4bd0af7a88
|
Standardize and update code
|
2018-09-20 14:05:57 +02:00 |
|
Philippe GRAND
|
0222ea7e8c
|
Standardize and update code
|
2018-09-20 09:19:17 +02:00 |
|
Philippe GRAND
|
06ad6e7196
|
Standardize and update code
|
2018-09-20 09:04:12 +02:00 |
|
Philippe GRAND
|
9a487169c8
|
Standardize and update code
|
2018-09-20 09:03:52 +02:00 |
|
Philippe GRAND
|
bd3ba04e24
|
Standardize and update code
|
2018-09-19 16:36:08 +02:00 |
|
Philippe GRAND
|
57fc8cf06f
|
Standardize and update code
|
2018-09-19 16:31:36 +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
|
ad6ecc6231
|
Standardize and update code
|
2018-09-18 16:49:20 +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 |
|
John BOTELLA
|
477acb2e4c
|
change new PDF version
|
2018-09-14 09:48:15 +02:00 |
|
Laurent Destailleur
|
963d5eeddf
|
Merge pull request #9387 from frederic34/camelCaps2
start changing phpcs:ignore
|
2018-09-12 21:14:34 +02:00 |
|
Philippe GRAND
|
06cde1c35f
|
Standardize and update code
|
2018-09-12 19:32:30 +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
|
1ae1afe843
|
move phpcs:ignore
|
2018-09-04 08:09:48 +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
|
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 |
|
Frédéric FRANCE
|
6cb0fb10d6
|
trim trailing
|
2018-07-26 19:05:34 +02:00 |
|
Laurent Destailleur
|
76c6f28d85
|
Merge pull request #9035 from grandoc/new_branch_29_06_2018
update code
|
2018-07-16 10:09:46 +02:00 |
|
Philippe GRAND
|
1cc73ae8ca
|
docs: complete comments
|
2018-07-05 10:16:20 +02:00 |
|
Regis Houssin
|
05c666c18b
|
Fix: use numbering model corresponding to the entity of the object
|
2018-07-01 17:06:19 +02:00 |
|
Regis Houssin
|
80adac12c0
|
Fix: use object entity ID instead current entity
|
2018-07-01 16:01:30 +02:00 |
|
Philippe GRAND
|
640f7697e4
|
update code
|
2018-06-30 11:45:49 +02:00 |
|
John
|
008163628a
|
New pdf documents using new column system
|
2018-06-26 08:03:25 +02: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
|
fa252d5cbd
|
Merge branch 'develop' into FIX_6.0_pdf_note_incoterm
|
2018-05-25 11:59:22 +02:00 |
|
Laurent Destailleur
|
9f2f8ca7e0
|
Fix scrutinizer
|
2018-05-25 09:31:16 +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
|
a1c799507a
|
Fix $contactobject not always defined
|
2018-05-23 08:16:24 +02:00 |
|
Laurent Destailleur
|
55f982e504
|
Removed deprecated FPDI option and reorganise PDF setup page
|
2018-04-30 09:28:24 +02:00 |
|
Frédéric FRANCE
|
d4c03230a0
|
add optional esign field in pdf propal
|
2018-04-15 11:34:21 +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 |
|
Regis Houssin
|
093ea49cc6
|
Fix: use "multidir_output" instead "dir_output"
|
2018-02-26 11:35:30 +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
|
ab21769aa2
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/compta/facture/card.php
|
2018-02-08 12:58:47 +01:00 |
|
atm-ph
|
6254e20c67
|
Fix position if module use pdf hook "linkedobjects"
|
2018-02-07 15:41:39 +01:00 |
|
Laurent Destailleur
|
5455ab3280
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/projet/card.php
|
2018-02-04 23:17:09 +01:00 |
|
Laurent Destailleur
|
f3700b66c6
|
Fix size of columns when using PRODUCT_USE_UNIT
|
2018-02-04 11:17:45 +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
|
f33182acc5
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-11-12 20:49:53 +01:00 |
|
atm-ph
|
2636c2470b
|
Fix width of payment term is to large
|
2017-11-10 10:52:58 +01:00 |
|
Laurent Destailleur
|
9c45e86a1c
|
Introduce main_doc into table of objects to know what is main doc.
Work on option PROPOSAL_USE_ONLINE_SIGN
|
2017-10-19 11:40:40 +02:00 |
|
Laurent Destailleur
|
8e0da9bfeb
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/holiday/document.php
|
2017-10-04 13:32:53 +02:00 |
|
Laurent Destailleur
|
537a551bb5
|
Fix vat visiblity on pdf
|
2017-09-27 21:58:42 +02: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
|
eadfbfe2bd
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/lib/functions2.lib.php
|
2017-09-13 20:57:53 +02: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
|
859d0dfe97
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2017-09-06 19:24:42 +02:00 |
|
Laurent Destailleur
|
9cc344f8cc
|
Fix problem in type and customer code substitution in numbering module
|
2017-09-06 10:11: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
|
d96a83adac
|
Fix bad total included tax when mutlicurrency is on
|
2017-08-29 16:37:00 +02:00 |
|