Laurent Destailleur
|
5d0a0fe341
|
Clean code
|
2021-02-26 14:53:16 +01:00 |
|
Frédéric FRANCE
|
554e449e40
|
code syntax core directory
|
2021-02-23 22:03:23 +01:00 |
|
Laurent Destailleur
|
026259ebd7
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/ajax.lib.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/product/fournisseurs.php
|
2021-02-15 13:12:27 +01:00 |
|
Laurent Destailleur
|
1b11d9d0e9
|
FIX payment term label on PDF
|
2021-02-11 17:48:53 +01:00 |
|
Philippe GRAND
|
bf211c6423
|
fix typo
|
2021-02-06 13:10:00 +01:00 |
|
Philippe GRAND
|
e584792382
|
missing declaration
|
2021-01-30 12:57:06 +01:00 |
|
Philippe GRAND
|
0f19a11ebe
|
missing declaration
|
2021-01-30 12:54:10 +01:00 |
|
Laurent Destailleur
|
832db82fce
|
Fix warnings
|
2020-12-18 14:40:45 +01:00 |
|
Laurent Destailleur
|
9c759e91f0
|
Fix debug management of docs in ticket module
|
2020-12-16 19:01:26 +01:00 |
|
Laurent Destailleur
|
82710e54a8
|
Fix get custom odt templates
|
2020-12-16 18:10:40 +01:00 |
|
Frédéric FRANCE
|
479d709a96
|
fix warning
|
2020-12-12 09:39:54 +01:00 |
|
Laurent Destailleur
|
46171a6ec8
|
Fix option MAIN_USE_COMPANY_NAME_OF_CONTACT
|
2020-12-02 21:27:15 +01:00 |
|
Laurent Destailleur
|
250b42f60a
|
Fix phpcs
|
2020-11-27 00:37:36 +01:00 |
|
Laurent Destailleur
|
9aa657bc35
|
Debug v13
|
2020-11-26 18:48:51 +01:00 |
|
Laurent Destailleur
|
5d0a54c0de
|
Fix var not defined
|
2020-11-26 12:07:01 +01:00 |
|
Laurent Destailleur
|
74605cec12
|
Fix warning
|
2020-11-25 18:07:52 +01:00 |
|
Laurent Destailleur
|
bd0236edeb
|
Fix #15438
|
2020-11-24 20:53:42 +01:00 |
|
Laurent Destailleur
|
af2eabb24d
|
Fix warning
|
2020-11-22 15:06:53 +01:00 |
|
Laurent Destailleur
|
3d2da45f84
|
Remove warning
|
2020-11-22 11:36:07 +01:00 |
|
Laurent Destailleur
|
6c42535eb2
|
Maxi debug v13
|
2020-11-16 12:20:18 +01:00 |
|
Laurent Destailleur
|
db357da9a7
|
Merge pull request #15410 from frederic34/patch-19
doxygen
|
2020-11-15 17:04:17 +01:00 |
|
Laurent Destailleur
|
31c73403c0
|
Update pdf_eratosthene.modules.php
|
2020-11-15 17:04:07 +01:00 |
|
Laurent Destailleur
|
5c15162c40
|
Fix warning
|
2020-11-15 15:10:15 +01:00 |
|
Frédéric FRANCE
|
9c258b5dd4
|
Update pdf_eratosthene.modules.php
|
2020-11-14 20:46:49 +01:00 |
|
Frédéric FRANCE
|
e1c148a994
|
doxygen
|
2020-11-14 20:44:44 +01:00 |
|
Frédéric FRANCE
|
1db8afb4a9
|
doxygen
|
2020-11-14 20:40:17 +01:00 |
|
Laurent Destailleur
|
a168c3fbb1
|
Remove warnings
|
2020-11-12 12:33:29 +01:00 |
|
Laurent Destailleur
|
e0ed89c514
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/compta/facture/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/product/class/product.class.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
|
2020-11-01 17:58:41 +01:00 |
|
Laurent Destailleur
|
72160deef7
|
FIX #14979
|
2020-11-01 17:01:26 +01:00 |
|
Scrutinizer Auto-Fixer
|
7f52920716
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 13:32:18 +00:00 |
|
Laurent Destailleur
|
ec6c735d89
|
Clean code
|
2020-10-27 19:44:15 +01:00 |
|
Laurent Destailleur
|
0908ac5867
|
Fix phpcs
|
2020-10-14 20:18:07 +02:00 |
|
Laurent Destailleur
|
4a3a3190ea
|
Standardize pdf templates
|
2020-10-14 01:46:49 +02:00 |
|
Philippe GRAND
|
b26a1042d2
|
Minimum version of PHP required by module
|
2020-07-11 15:02:03 +02:00 |
|
Philippe GRAND
|
fd01a4d154
|
Minimum version of PHP required by module
|
2020-07-11 14:31:16 +02:00 |
|
Laurent Destailleur
|
c8d0476728
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
|
2020-06-01 04:09:52 +02:00 |
|
Laurent Destailleur
|
dbac97a908
|
Fix several troubles into numbering modules.
Prefix for takepos moved from TK to TC (TK was already used for tasks)
|
2020-06-01 04:02:47 +02:00 |
|
Frédéric FRANCE
|
b41ac00b98
|
add new rule
|
2020-05-21 15:05:19 +02:00 |
|
Frédéric FRANCE
|
ee6fadd0d5
|
add new rule
|
2020-05-21 01:41:27 +02:00 |
|
Frédéric FRANCE
|
2fde77703d
|
add extrafields in note for enstein
|
2020-04-21 23:06:41 +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 |
|
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 |
|
John Botella
|
1ca1f0677b
|
fix PDF cell padding
|
2020-02-24 17:48:01 +01:00 |
|
Tobias Sekan
|
b29d8e53ed
|
Add position to ODT order template
|
2020-02-24 14:58:01 +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
|
8c36dd0ad8
|
add extrafields in notes
|
2020-02-23 02:26:21 +01:00 |
|
ATM john
|
60b3d9d4db
|
Add extrafields on PDF object lines for compatible pdf
|
2020-02-22 18:07:15 +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 |
|
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 |
|
Pierre Ardoin
|
573d86c725
|
Add project's ref and Title
|
2020-02-10 16:57:59 +01:00 |
|
Pierre Ardoin
|
546e7b1bcf
|
Add project Ref and Title
|
2020-02-10 16:57:02 +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 |
|
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
|
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
|
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
|
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
|
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
|
3825e9af06
|
FIX logo not found in some cases
|
2020-01-01 03:00:10 +01:00 |
|
Frédéric FRANCE
|
ee7fe66749
|
Update doc_generic_order_odt.modules.php
|
2019-12-31 14:19:31 +01:00 |
|
Frédéric FRANCE
|
b6c9de3928
|
upload odt models for order
|
2019-12-17 14:49:18 +01:00 |
|
Laurent Destailleur
|
a612aefab7
|
Fix HTML5
|
2019-12-12 11:11:08 +01:00 |
|
Scrutinizer Auto-Fixer
|
36a74cd160
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-03 10:17:29 +00:00 |
|
ATM John BOTELLA
|
773f823748
|
factoring token usage
|
2019-12-01 10:20:11 +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 |
|
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 |
|
Frédéric FRANCE
|
8f6d38ee82
|
clean indent
|
2019-10-27 17:01:23 +01:00 |
|
Laurent Destailleur
|
5a55997540
|
Update pdf_eratosthene.modules.php
|
2019-10-14 20:53:18 +02:00 |
|
Philippe GRAND
|
fd90ebe63b
|
add missing translation
|
2019-10-14 15:57:29 +02:00 |
|
Philippe GRAND
|
e326c23245
|
add missing translation
|
2019-10-14 15:48:24 +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
|
985cfab8e9
|
Traduction
|
2019-09-08 05:22:13 +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 |
|
Laurent Destailleur
|
4534826583
|
Merge pull request #11633 from fmarcet/10.0
FIX: Make protected all pfd models functions
|
2019-08-15 19:04:32 +02:00 |
|
Regis Houssin
|
7c8b3c9a38
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-08-13 07:34:02 +02:00 |
|
Ferran Marcet
|
f1c0442a77
|
FIX: Add comment before protected functions
|
2019-08-12 10:16:04 +02:00 |
|
Laurent Destailleur
|
8647a20c18
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/langs/en_US/admin.lang
htdocs/product/dynamic_price/class/price_parser.class.php
htdocs/product/stats/facture.php
|
2019-08-10 01:57:43 +02:00 |
|
Laurent Destailleur
|
2824dee11a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/product/dynamic_price/class/price_parser.class.php
|
2019-08-10 01:20:17 +02:00 |
|
Frédéric FRANCE
|
7f23b77cbe
|
Update pdf_proforma.modules.php
|
2019-08-05 15:00:06 +02:00 |
|
Frédéric FRANCE
|
fde526f59d
|
Update pdf_einstein.modules.php
|
2019-08-05 14:58:50 +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
|
9f7d118f6f
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-27 02:40:56 +02:00 |
|
Laurent Destailleur
|
0b69bf9957
|
FIX #11553
|
2019-07-25 18:17:17 +02:00 |
|