Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

486 Commits

Author SHA1 Message Date
Laurent Destailleur
3825e9af06 FIX logo not found in some cases 2020-01-01 03:00:10 +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
Philippe GRAND
25b9be9de7 update code 2019-10-11 10:19:58 +02:00
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