ATM john
|
b70cd84402
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
|
2020-04-14 14:11:12 +02:00 |
|
Laurent Destailleur
|
8c8a8263dd
|
Merge branch 'develop' into patch-145
|
2020-04-13 16:22:19 +02:00 |
|
Laurent Destailleur
|
99cbb273c8
|
Update pdf_crabe.modules.php
|
2020-04-13 16:21:47 +02:00 |
|
Scrutinizer Auto-Fixer
|
444c293c01
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-10 08:59:32 +00:00 |
|
Scrutinizer Auto-Fixer
|
612bac6598
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-05 00:44:59 +00:00 |
|
Laurent Destailleur
|
e6641b5369
|
Fix doc
|
2020-04-03 18:01:54 +02:00 |
|
ATM john
|
c466beea3d
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
|
2020-03-31 16:28:43 +02:00 |
|
Laurent Destailleur
|
61cb1ec81a
|
Merge pull request #13185 from atm-john/12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
NEW : Allow extrafields on pdf : extend to line desc
|
2020-03-11 17:12:14 +01:00 |
|
ATM john
|
7f2dd19bb0
|
Fix pdf cell padding for model cyan, erathosthene, espadon, cornas
|
2020-02-24 21:43:33 +01:00 |
|
stickler-ci
|
6de74e774e
|
Fixing style errors.
|
2020-02-24 19:50:07 +00:00 |
|
ATM john
|
3c4e7f7b07
|
Fix cell padding sponge
|
2020-02-24 20:47:19 +01:00 |
|
John Botella
|
1ca1f0677b
|
fix PDF cell padding
|
2020-02-24 17:48:01 +01:00 |
|
Tobias Sekan
|
7469aa1f35
|
Add position to ODT invoice template
|
2020-02-24 15:00:37 +01:00 |
|
John Botella
|
06b2d459c0
|
Fix cell padding
|
2020-02-24 14:18:49 +01:00 |
|
Laurent Destailleur
|
3682d9143e
|
Fix showing bank account on PDF
|
2020-02-24 04:55:44 +01:00 |
|
Laurent Destailleur
|
150d4d33f6
|
Fix showing bank account on PDF
|
2020-02-24 04:55:09 +01:00 |
|
ATM john
|
13790422dc
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
|
2020-02-24 00:18:37 +01:00 |
|
ATM john
|
377b9a6b88
|
Add extrafields on PDF object lines desc for compatible pdf
|
2020-02-24 00:14:43 +01:00 |
|
ATM john
|
5ecef88b35
|
allow in extrafield conf to choose to add extrafield in a new col or append it to description, it could be useful for html or long text extrafields
|
2020-02-23 23:04:24 +01:00 |
|
ATM john
|
8c36dd0ad8
|
add extrafields in notes
|
2020-02-23 02:26:21 +01:00 |
|
ATM john
|
e209fd2973
|
Add extrafields on PDF object lines
|
2020-02-22 16:27:44 +01:00 |
|
ATM john
|
aa77d96f23
|
remove IDE warnings
|
2020-02-22 12:06:21 +01:00 |
|
ATM john
|
4117aa56a2
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
|
2020-02-22 11:19:49 +01:00 |
|
Scrutinizer Auto-Fixer
|
e44865d8b5
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-21 16:53:37 +00:00 |
|
Laurent Destailleur
|
ec09e7222d
|
Fix remove a lot of warnings on Eclipse
|
2020-02-21 17:31:37 +01:00 |
|
John Botella
|
729048a113
|
Fix langs
|
2020-02-19 12:33:36 +01:00 |
|
John Botella
|
d65c17df7d
|
Add retained warranty for all invoice for crabe PDF
|
2020-02-19 12:30:52 +01:00 |
|
John Botella
|
6acf10c0d4
|
extend retained warranty to be available for all invoices
|
2020-02-19 11:54:55 +01:00 |
|
Scrutinizer Auto-Fixer
|
17010478ba
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-13 09:44:08 +00:00 |
|
stickler-ci
|
f8eaca24af
|
Fixing style errors.
|
2020-02-12 20:54:56 +00:00 |
|
Laurent Destailleur
|
c31fcb3981
|
Merge branch 'develop' into patch-30
|
2020-02-12 21:53:02 +01:00 |
|
Laurent Destailleur
|
8518e0752f
|
NEW Can edit option PDF_USE_ALSO_LANGUAGE_CODE from PDF setup page
|
2020-02-11 16:01:32 +01:00 |
|
Pierre Ardoin
|
f279b4138b
|
Add Project Ref and Title
|
2020-02-10 16:52:41 +01:00 |
|
Pierre Ardoin
|
6de3795648
|
change translation Ref
ProjectRef -> RefProject
|
2020-02-10 09:10:45 +01:00 |
|
Pierre Ardoin
|
d74e1d9182
|
Update pdf_crabe.modules.php
|
2020-02-10 09:07:26 +01:00 |
|
stickler-ci
|
5022e58b95
|
Fixing style errors.
|
2020-02-10 08:04:40 +00:00 |
|
Pierre Ardoin
|
bd00803090
|
Update pdf_crabe.modules.php
|
2020-02-10 09:03:00 +01:00 |
|
stickler-ci
|
6ffbab0a63
|
Fixing style errors.
|
2020-02-10 08:01:40 +00:00 |
|
Pierre Ardoin
|
815206cb15
|
Add Project Title in header of pdf
Add project Title if Global Constant PDF_SHOW_PROJECT_TITLE is active.
|
2020-02-10 08:59:22 +01:00 |
|
Laurent Destailleur
|
a2bb64354b
|
Fix bad merge
|
2020-02-05 14:56:01 +01:00 |
|
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
|
ccf8e81f93
|
FIX #12975
|
2020-02-03 03:10:10 +01:00 |
|
Laurent Destailleur
|
240727c3e1
|
FIX #12975
|
2020-02-03 03:08:54 +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
|
a230a0aa13
|
Fix url to pay
|
2020-01-27 21:37:52 +01:00 |
|
Laurent Destailleur
|
06731bdd59
|
Fix phpcs
|
2020-01-25 14:40:16 +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
|
395b9bf7ac
|
Fix syntax error
|
2020-01-22 13:41:05 +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 |
|
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
|
65fef47bdb
|
Enable new pdf templates as stable
|
2020-01-20 01:05:30 +01:00 |
|
Laurent Destailleur
|
ab1a56c881
|
Merge pull request #12781 from frederic34/patch-11
NEW upload odt models for invoices
|
2020-01-13 13:41:49 +01:00 |
|
Laurent Destailleur
|
3825e9af06
|
FIX logo not found in some cases
|
2020-01-01 03:00:10 +01:00 |
|
Laurent Destailleur
|
15f1153e82
|
FIX Avoid line feed when 100%
|
2019-12-31 17:22:12 +01:00 |
|
Frédéric FRANCE
|
596e2ccefc
|
Update doc_generic_invoice_odt.modules.php
|
2019-12-31 14:15:17 +01:00 |
|
Frédéric FRANCE
|
b6f7394959
|
NEW upload odt models for invoices
|
2019-12-31 14:13:10 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Scrutinizer Auto-Fixer
|
c8baaa2995
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-16 12:06:25 +00:00 |
|
Laurent Destailleur
|
a612aefab7
|
Fix HTML5
|
2019-12-12 11:11:08 +01:00 |
|
Laurent Destailleur
|
1f5bea01f5
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/product/fournisseurs.php
htdocs/user/card.php
|
2019-11-14 21:30:16 +01:00 |
|
Laurent Destailleur
|
80b3e27341
|
Fix bad name of constant
|
2019-11-14 14:23:48 +01:00 |
|
Laurent Destailleur
|
7e0ae4bf0e
|
FIX The pdf templates were using the large logo making PDF too large
|
2019-11-14 14:17:22 +01:00 |
|
Laurent Destailleur
|
86094613e8
|
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:06 +01:00 |
|
Scrutinizer Auto-Fixer
|
b40ecc3933
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:37:08 +00:00 |
|
Scrutinizer Auto-Fixer
|
8a527631a0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:02 +00:00 |
|
BENKE Charlene
|
53fd8328bc
|
add certificate if present on document folder
|
2019-11-09 15:20:36 +01:00 |
|
Laurent Destailleur
|
1fa61077a0
|
FIX #12356
|
2019-11-07 14:07:50 +01:00 |
|
Frédéric FRANCE
|
8f6d38ee82
|
clean indent
|
2019-10-27 17:01:23 +01:00 |
|
Philippe GRAND
|
a07ab341f8
|
Standardization
|
2019-10-18 13:00:31 +02:00 |
|
Philippe GRAND
|
41d2cb2c29
|
Standardization
|
2019-10-18 12:56:40 +02:00 |
|
Philippe GRAND
|
f43d51bfec
|
Standardization
|
2019-10-18 12:51:49 +02:00 |
|
Philippe GRAND
|
731f4587e2
|
Merge remote-tracking branch 'origin/new_branch_18_10_2019' into new_branch_18_10_2019
|
2019-10-18 12:44:40 +02:00 |
|
Philippe GRAND
|
18b183f516
|
Standardization
|
2019-10-18 12:43:25 +02:00 |
|
stickler-ci
|
0c61e798a6
|
Fixing style errors.
|
2019-10-18 09:42:15 +00:00 |
|
Philippe GRAND
|
3b56d91727
|
Standardization
|
2019-10-18 11:41:18 +02:00 |
|
Laurent Destailleur
|
f85899742b
|
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-17 17:48:42 +02:00 |
|
Philippe GRAND
|
2efeeb0ad8
|
Internationalization
|
2019-10-17 14:47:03 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +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 |
|
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
|
d9ea61e47c
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop_menu
Conflicts:
htdocs/commande/class/commande.class.php
|
2019-07-31 12:49:56 +02:00 |
|
Laurent Destailleur
|
a7390e7e47
|
Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop
NEW Management of retained warranty on situation invoices
|
2019-07-30 21:53:09 +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
|
f5cc29417d
|
Translation lignes -> lines
|
2019-07-05 21:50:35 +02:00 |
|
John Botella
|
9c2e83dcae
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
|
2019-07-01 09:51:26 +02:00 |
|
Laurent Destailleur
|
adb3062a9f
|
Work on nblignes -> nblines
|
2019-06-29 16:38:14 +02:00 |
|
Laurent Destailleur
|
b37f55d13a
|
Add log
|
2019-06-29 16:06:40 +02:00 |
|
Laurent Destailleur
|
cd024da628
|
Merge branch 'develop' into new_branch_27_06_2019
|
2019-06-28 13:39:27 +02:00 |
|
Philippe GRAND
|
2c237b8420
|
translations
|
2019-06-27 09:51:48 +02:00 |
|
John Botella
|
ee98f3e6d7
|
fix travis recommendations
|
2019-06-26 10:48:22 +02:00 |
|
John Botella
|
7e14a598e2
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
|
2019-06-26 09:43:43 +02:00 |
|
John Botella
|
4c4444a53f
|
fix travis recommendations
|
2019-06-26 09:36:53 +02:00 |
|
John Botella
|
ec7446762c
|
Fix travis
|
2019-06-24 14:36:06 +02:00 |
|
John Botella
|
9c414a7a57
|
Change function to camel case
|
2019-06-24 12:22:33 +02:00 |
|
John Botella
|
a83e7f3665
|
Add retained warranty to PDF
|
2019-06-24 12:00:55 +02:00 |
|
John Botella
|
7b6925b8f7
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
|
2019-06-24 10:29:43 +02:00 |
|
Philippe GRAND
|
d75f4eb1c8
|
translation
|
2019-06-22 12:07:46 +02:00 |
|
Regis Houssin
|
6597c9f60d
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-06-17 06:45:08 +02:00 |
|
Laurent Destailleur
|
e8b139d1c6
|
Fix repeated logs and fetch
|
2019-06-13 22:48:31 +02:00 |
|
John BOTELLA
|
d7a393bbd3
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
|
2019-06-04 14:00:18 +02:00 |
|
Regis Houssin
|
7b8b1a9052
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-06-03 11:04:28 +02:00 |
|
Laurent Destailleur
|
ccfb4f575b
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formfile.class.php
|
2019-05-24 15:00:14 +02:00 |
|
Laurent Destailleur
|
89455672a2
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
|
2019-05-24 14:58:21 +02:00 |
|
Marc de Lima Lucio
|
49385fcab3
|
FIX: situation invoices: bad detailed VAT in situations following the first one
|
2019-05-23 14:37:40 +02:00 |
|
Regis Houssin
|
156b25a702
|
FIX use "multidir_output" instead "dir_output"
|
2019-05-12 16:36:29 +02:00 |
|
Laurent Destailleur
|
bc49f47718
|
Fix phpcs
|
2019-05-09 19:48:13 +02:00 |
|
Laurent Destailleur
|
52153d6aa2
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-05-09 12:38:27 +02:00 |
|
Laurent Destailleur
|
677b333d0a
|
FIX: Add hidden option MAIN_PDF_HIDE_SITUATION to hide situation (quick
hack to fix output pb).
|
2019-05-09 12:38:00 +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
|
d3bbb93ada
|
Fix template for situation
Conflicts:
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
|
2019-05-09 12:16:43 +02:00 |
|
Laurent Destailleur
|
ed98817f0d
|
Fix template for situation
|
2019-05-09 10:15:38 +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
|
2ed71b0039
|
update code
|
2019-04-09 09:26:39 +02:00 |
|
Laurent Destailleur
|
1274d71a10
|
Fix phpcs
|
2019-04-08 16:00:01 +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 |
|
Laurent Destailleur
|
997d6cca0a
|
Fix $db not defined
|
2019-04-05 19:49:47 +02:00 |
|
John BOTELLA
|
a668cc28b1
|
Add table title auto height
|
2019-04-03 16:19:49 +02:00 |
|
Laurent Destailleur
|
64889f4639
|
Merge pull request #10947 from grandoc/new_branch_01_04_2019
update comments
|
2019-04-03 11:05:05 +02:00 |
|
Philippe Grand
|
ebe50a4efe
|
Update pdf_sponge.modules.php
|
2019-04-02 15:33:10 +02:00 |
|
Laurent Destailleur
|
8fe1be1a67
|
Removed deprecated use of string in dol_print_date(). Only date allowed.
|
2019-04-01 19:27:34 +02:00 |
|
Philippe GRAND
|
2c41610ac8
|
update comments
|
2019-04-01 09:21:08 +02:00 |
|
Philippe GRAND
|
ae681eaf06
|
update comments
|
2019-04-01 09:18:56 +02:00 |
|
Frédéric FRANCE
|
b69f63e7d7
|
replace html by html5
|
2019-03-10 09:32:19 +01:00 |
|
Frédéric FRANCE
|
c5c27fdb77
|
add visibility
|
2019-03-01 19:24:06 +01:00 |
|
Frédéric FRANCE
|
bd2e541fd6
|
add visibility
|
2019-03-01 18:28:51 +01:00 |
|
Frédéric FRANCE
|
796ea6f4ea
|
add visibility
|
2019-02-28 23:19:58 +01:00 |
|
Frédéric FRANCE
|
e7706192b5
|
doc comment
|
2019-02-24 10:08:42 +01:00 |
|
Frédéric FRANCE
|
210fb2eac1
|
Update mod_facture_mercure.php
|
2019-02-13 23:41:47 +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 |
|
Laurent Destailleur
|
ed733fb82d
|
Fix phpcs
|
2019-02-08 13:28:10 +01:00 |
|
Laurent Destailleur
|
8760b1e592
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-08 12:57:50 +01:00 |
|
Laurent Destailleur
|
27da574e38
|
Fix phpcs
|
2019-02-08 12:36:33 +01:00 |
|
Laurent Destailleur
|
1611c613f5
|
Fix phpcs
|
2019-02-08 12:19:51 +01:00 |
|
Laurent Destailleur
|
ec686a8f79
|
Fix phpcs
|
2019-02-08 11:30:20 +01:00 |
|
Laurent Destailleur
|
38d4284638
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/db/pgsql.class.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/filefunc.inc.php
htdocs/imports/import.php
htdocs/supplier_proposal/card.php
|
2019-02-08 11:26:08 +01:00 |
|
Laurent Destailleur
|
fe1188c4ea
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/filefunc.inc.php
|
2019-02-08 10:44:45 +01:00 |
|
atm-ph
|
8e6a567b09
|
Fix display payment table on multiple pages
|
2019-02-07 12:36:22 +01:00 |
|
Frédéric FRANCE
|
e1e14ae6e6
|
wip
|
2019-02-03 22:58:56 +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
|
f5b2cf75f2
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-01 18:31:44 +01:00 |
|
Laurent Destailleur
|
6de732d7f8
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
|
2019-02-01 16:07:18 +01:00 |
|
Laurent Destailleur
|
35f65a571c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
htdocs/fourn/commande/list.php
|
2019-02-01 16:05:43 +01:00 |
|
Laurent Destailleur
|
dee2a373c1
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
|
2019-02-01 16:01:18 +01:00 |
|
gauthier
|
09ba059c21
|
FIX : need an order by in case we found other invoice with same number but not same date
|
2019-01-31 11:03:06 +01:00 |
|
Laurent Destailleur
|
e18bd6f986
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 18:27:35 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
f30a3d59ba
|
Merge branch 'develop' into toomanylines
|
2019-01-27 17:59:13 +01:00 |
|
Laurent Destailleur
|
4f9f0fd7b5
|
Merge branch 'develop' into elseif
|
2019-01-27 17:54:06 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
Frédéric FRANCE
|
496fa9b0fb
|
PSR2.Files.EndFileNewline.TooMany
|
2019-01-27 14:10:35 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Frédéric FRANCE
|
6e91b3cefc
|
PSR2 usage of else if is discouraged
|
2019-01-27 10:49:34 +01:00 |
|
atm-quentin
|
013c078c8b
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice
|
2019-01-16 10:52:46 +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 |
|
Maxime Kohlhaas
|
8fea6338e1
|
Fix #6565
Fix pdf footer height for all documents
|
2018-12-02 18:51:49 +01:00 |
|
Maxime Kohlhaas
|
2e496ea83a
|
QUAL rename facnumber by ref
|
2018-12-02 17:33:44 +01:00 |
|
Laurent Destailleur
|
6d84036f66
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/action/index.php
htdocs/contact/list.php
htdocs/core/class/html.form.class.php
htdocs/expensereport/card.php
htdocs/install/doctemplates/shipment/template_shipment.odt
htdocs/public/payment/newpayment.php
|
2018-12-01 19:23:06 +01:00 |
|
florian HENRY
|
589511f38c
|
fix #9999
|
2018-12-01 16:23:40 +01:00 |
|
atm-quentin
|
56d4a8a737
|
revert some code
|
2018-11-16 15:16:48 +01:00 |
|
atm-quentin
|
7571760fdd
|
fix errors during cherry picking
|
2018-11-16 11:31:23 +01:00 |
|
atm-quentin
|
70fdff5c27
|
revert getNextValue function + createfromclone entity
|
2018-11-16 11:23:14 +01:00 |
|
atm-quentin
|
c18f486179
|
set facture to invoice AND check invoicenumber conf
|
2018-11-16 11:20:03 +01:00 |
|
atm-quentin
|
a8ab666d62
|
remplacement en masse des $conf->entity par des getEntity('facture')
|
2018-11-16 11:17:18 +01:00 |
|
atm-quentin
|
8e51204dff
|
manage invoice with multicompany
|
2018-11-16 11:14:33 +01:00 |
|
Regis Houssin
|
0907a6d611
|
FIX wrong object name (travis error)
|
2018-11-14 16:55:14 +01:00 |
|
Regis Houssin
|
93a1e941a4
|
FIX new method: override constants of current entity
|
2018-11-14 15:34:39 +01:00 |
|
Regis Houssin
|
9ff4b31843
|
FIX compatibility with invoice sharing and invoice number sharing
|
2018-11-14 15:24:22 +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 |
|