Laurent Destailleur
|
1875b6a49b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/security2.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
|
2020-02-05 14:53:47 +01:00 |
|
stickler-ci
|
5dcd5e5b87
|
Fixing style errors.
|
2020-02-03 09:54:35 +01:00 |
|
AdrianDominik
|
ed269a387f
|
FIX: #11975 When a product is split between multiple pages in a document, prices/quantity/etc appear on the last relevant page
|
2020-02-03 09:54:34 +01:00 |
|
Laurent Destailleur
|
37617bbce8
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-03 03:48:27 +01:00 |
|
Laurent Destailleur
|
5633f58477
|
FIX #12978
|
2020-02-03 03:25:41 +01:00 |
|
Laurent Destailleur
|
ccf8e81f93
|
FIX #12975
|
2020-02-03 03:10:10 +01:00 |
|
Laurent Destailleur
|
ff6bcbdcf8
|
Fix trans
|
2020-02-03 03:10:03 +01:00 |
|
Laurent Destailleur
|
240727c3e1
|
FIX #12975
|
2020-02-03 03:08:54 +01:00 |
|
Laurent Destailleur
|
3f73339818
|
Fix trans
|
2020-02-03 03:01:23 +01:00 |
|
Laurent Destailleur
|
fc47fa5ec3
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/projet/element.php
|
2020-02-03 02:58:45 +01:00 |
|
Laurent Destailleur
|
ffa847bc8e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-02 19:32:37 +01:00 |
|
Laurent Destailleur
|
1c24bcc724
|
FIX CVE Need permission to be able to develop modules
|
2020-01-31 10:29:41 +01:00 |
|
Scrutinizer Auto-Fixer
|
5fda829023
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-01-30 00:48:28 +00:00 |
|
Laurent Destailleur
|
1e879126cd
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/exports/class/export.class.php
|
2020-01-29 19:28:06 +01:00 |
|
Laurent Destailleur
|
60f772d285
|
FIX Pending amount to pay must be zero if invoice close for anticipated
payment.
|
2020-01-29 17:56:09 +01:00 |
|
andreubisquerra
|
09bcb39cff
|
Default to Example
|
2020-01-28 18:59:51 +01:00 |
|
andreubisquerra
|
d0b3614c57
|
Default receipt template
|
2020-01-28 15:31:03 +01:00 |
|
Laurent Destailleur
|
a230a0aa13
|
Fix url to pay
|
2020-01-27 21:37:52 +01:00 |
|
Laurent Destailleur
|
17ceeb6a6e
|
Merge pull request #12729 from frederic34/patch-6
NEW upload odt models for order
|
2020-01-26 23:55:04 +01:00 |
|
Laurent Destailleur
|
9cd2a63752
|
Merge pull request #12739 from frederic34/patch-7
NEW upload odt models for proposal
|
2020-01-26 23:49:31 +01:00 |
|
Laurent Destailleur
|
0f2141269a
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2020-01-25 14:43:57 +01:00 |
|
Laurent Destailleur
|
06731bdd59
|
Fix phpcs
|
2020-01-25 14:40:16 +01:00 |
|
Laurent Destailleur
|
f2771b3365
|
FIX #12896
|
2020-01-25 14:23:23 +01:00 |
|
Laurent Destailleur
|
41577714ce
|
Add link to pay online into sponge template.
|
2020-01-23 11:25:08 +01:00 |
|
Laurent Destailleur
|
298b273496
|
Merge branch 'develop' into patch-22
|
2020-01-23 11:20:24 +01:00 |
|
Laurent Destailleur
|
2679f057fb
|
Doc
|
2020-01-22 14:40:43 +01:00 |
|
Laurent Destailleur
|
d6a31f60cd
|
Clean code
|
2020-01-22 14:39:00 +01:00 |
|
Laurent Destailleur
|
ee21ea5ef8
|
Fix phpcs
|
2020-01-22 14:27:38 +01:00 |
|
Laurent Destailleur
|
d3411a79ef
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-22 14:11:44 +01:00 |
|
Laurent Destailleur
|
395b9bf7ac
|
Fix syntax error
|
2020-01-22 13:41:05 +01:00 |
|
Laurent Destailleur
|
de99426247
|
Fix MRP
|
2020-01-22 12:53:51 +01:00 |
|
Laurent Destailleur
|
8bd835d937
|
NEW Add option PDF_USE_ALSO_LANGUAGE_CODE to generate PDF in 2 languages
in same document.
|
2020-01-21 16:17:18 +01:00 |
|
Laurent Destailleur
|
b813a5a4e0
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-21 13:03:02 +01:00 |
|
Laurent Destailleur
|
ca3e6ff60c
|
Doc
|
2020-01-21 12:46:28 +01:00 |
|
Laurent Destailleur
|
49e875aa96
|
Fix fatal error
|
2020-01-21 12:21:37 +01:00 |
|
Laurent Destailleur
|
a3a3835c76
|
Fix fatal error
|
2020-01-21 12:19:39 +01:00 |
|
stickler-ci
|
b864325041
|
Fixing style errors.
|
2020-01-21 09:07:14 +00:00 |
|
Pierre Ardoin
|
1d4e36ba3d
|
Add Link to Pay if Online payment is used
Before : URL to Online Payment never shown.
Now : URL shown when PayPal, Stripe or PayBox are used.
|
2020-01-21 10:04:49 +01:00 |
|
Laurent Destailleur
|
4598538b42
|
Prepare PDF templates to use 2 languages for titles
|
2020-01-21 01:55:00 +01:00 |
|
Laurent Destailleur
|
d6e81c5da4
|
Fix var not defined
|
2020-01-21 00:20:18 +01:00 |
|
Laurent Destailleur
|
65fef47bdb
|
Enable new pdf templates as stable
|
2020-01-20 01:05:30 +01:00 |
|
Scrutinizer Auto-Fixer
|
8744f6ab7b
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-01-18 15:17:07 +00:00 |
|
Scrutinizer Auto-Fixer
|
0aa156db78
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-01-16 01:54:00 +00:00 |
|
Laurent Destailleur
|
d07fa80a28
|
Removed export driver using phpexcel.
|
2020-01-15 21:09:11 +01:00 |
|
Laurent Destailleur
|
2c40e4be94
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-15 20:13:45 +01:00 |
|
Laurent Destailleur
|
a68da82bec
|
Code comment of export
|
2020-01-15 20:11:04 +01:00 |
|
Laurent Destailleur
|
98eda68afb
|
Fix linkg to public notes
|
2020-01-15 19:49:45 +01:00 |
|
Laurent Destailleur
|
3f79c00542
|
Merge branch 'develop' into actioncomm_category
|
2020-01-15 14:21:06 +01:00 |
|
Laurent Destailleur
|
34829644ed
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/projet/tasks/time.php
|
2020-01-15 13:38:28 +01:00 |
|
Laurent Destailleur
|
8e269c5e64
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/core/modules/modSociete.class.php
htdocs/filefunc.inc.php
|
2020-01-15 13:19:37 +01:00 |
|