Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,753 Commits 36 Branches 189 Tags
45f834cb15122c034e1666a03e920f159183d7dd
Commit Graph

518 Commits

Author SHA1 Message Date
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
7972a35e36 Update pdf_azur.modules.php 2020-04-21 23:12:12 +02:00
Laurent Destailleur
5254a94038 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ldap.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/index.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/expedition/list.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/list.php
	htdocs/loan/list.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/list.php
 2020-04-16 15:58:59 +02:00
Laurent Destailleur
984fa0d5a0 Fix hidden const 2020-04-16 15:24:12 +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
1f2203f0d6 Add position to ODT propale template 2020-02-24 15:04:02 +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
fab8536f05 add project ref and title 2020-02-10 17:02:10 +01:00
Pierre Ardoin
f9b03596f6 Add project ref and title 2020-02-10 17:01:21 +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
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
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
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
Laurent Destailleur
3825e9af06 FIX logo not found in some cases 2020-01-01 03:00:10 +01:00
Frédéric FRANCE
57a5416cbc Update doc_generic_proposal_odt.modules.php 2019-12-31 14:20:39 +01:00
Frédéric FRANCE
3d19e1321b NEW upload odt models for proposal 2019-12-19 11:10:55 +01:00
Laurent Destailleur
a612aefab7 Fix HTML5 2019-12-12 11:11:08 +01:00
Laurent Destailleur
dfeca5fae8 Fix phpcs 2019-12-09 17:42:38 +01:00
Laurent Destailleur
a77dc75bd4 Merge branch 'develop' into NEW_10.0_card_of_bill_created_from_template__add_link_to_template 2019-12-09 16:05:23 +01:00
Laurent Destailleur
606a13898c Merge pull request #12394 from mapiolca/patch-15 
Fix problem of display photo in the model
 2019-12-03 16:16:57 +01:00
Laurent Destailleur
a56d4407ca Merge branch 'develop' into patch-11 2019-12-03 13:25:19 +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
Frédéric FRANCE
c780838e34 The property db does not exist on mod_propale_saphir 2019-12-01 20:50:18 +01: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
ddcc14dc16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:15 +00: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
Pierre Ardoin
88fb094a78 Fix problem of display photo in the model 
Fix a problem with photo in the model :
Before : Check in the current entity the product's repertory to find a photo
Now : Check all entities product's repertories to find a photo
 2019-11-08 22:02:30 +01:00
Frédéric FRANCE
8f6d38ee82 clean indent 2019-10-27 17:01:23 +01:00
Frédéric FRANCE
86f22c4563 do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00