lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
80,267 Commits 43 Branches 150 Tags 886 MiB
445d09cf8a
Commit Graph

321 Commits

Author SHA1 Message Date
Frédéric FRANCE
8f6d38ee82
clean indent 2019-10-27 17:01:23 +01:00
Laurent Destailleur
e7e9898e0d FIX Better compatible fix for the trouble of weight / size units 2019-10-22 18:36:36 +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
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Philippe GRAND
10fd472392 internationalization 2019-10-16 15:59:08 +02:00
Philippe GRAND
cd825ba4be internationalization 2019-10-16 15:46:46 +02:00
stickler-ci
30099a821b Fixing style errors. 2019-10-14 19:39:00 +00:00
Philippe GRAND
6761e1ef33 Internationalization 2019-10-14 21:38:21 +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
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
Laurent Destailleur
a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2019-07-25 17:54:14 +02:00
Laurent Destailleur
4a8377e4fd Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-25 17:52:40 +02:00
Florian Mortgat
65e9d8f239 FIX: tk9877 - PDF rouget requires product.lib.php (otherwise measuring_units_string() is not defined) 2019-07-25 11:14:59 +02:00
Laurent Destailleur
bef3423764 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-07-22 19:12:27 +02:00
Laurent Destailleur
9f95b10d0e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/comm/action/peruser.php
	htdocs/compta/prelevement/card.php
	htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
 2019-07-22 19:11:27 +02:00
Laurent Destailleur
5dcf4d6646 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-22 19:06:48 +02:00
Laurent Destailleur
b4e0c5ef6c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-07-22 18:51:32 +02:00
Florian Mortgat
b100cdb9db FIX: extrafield loading bug due to assumption that an object is a third party while it may be a contact if MAIN_USE_COMPANY_NAME_OF_CONTACT is set. 2019-07-19 11:58:21 +02:00
Laurent Destailleur
4387d40b9a Translation lignes -> lines 2019-07-05 21:55:08 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Philippe GRAND
5a4ba837cc translations 2019-06-27 09:47:00 +02:00
Philippe GRAND
6e8d86fb4a translations 2019-06-27 09:43:50 +02:00
Frédéric FRANCE
9b9d4ddc45
Update mod_expedition_ribera.php 
The property db does not exist on mod_bom_advanced.
 2019-04-20 09:29:24 +02:00
Frédéric FRANCE
315349a681
replace @public by @var 2019-04-18 18:41:02 +02:00
Philippe GRAND
0de76fc128 update code 2019-04-09 09:23:50 +02:00
Laurent Destailleur
a19cedfc13 Fix phpcs 2019-04-09 00:48:12 +02:00
Laurent Destailleur
d01b54ca5b Fix phpcs 2019-04-08 18:02:27 +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
67760d6f41 Fix phpcs 2019-04-05 19:53:45 +02:00
John BOTELLA
3299b765f1 New pdf models 2019-04-04 10:16:20 +02:00
Frédéric FRANCE
b69f63e7d7
replace html by html5 2019-03-10 09:32:19 +01:00
Frédéric FRANCE
014f69850e
add visibility 2019-03-01 23:08:57 +01:00
Frédéric FRANCE
c5c27fdb77
add visibility 2019-03-01 19:24:06 +01:00
Frédéric FRANCE
e7706192b5
doc comment 2019-02-24 10:08:42 +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
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
a268a13c89
Merge pull request #10423 from grandoc/new_branch_27_01_2019 
fix translations
 2019-01-27 17:55:05 +01:00
Philippe GRAND
b8ec33d29b fix translations 2019-01-27 17:28:18 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +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