Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Laurent Destailleur
|
94bd0f71d9
|
Fix pb with permission
|
2019-11-05 19:41:30 +01:00 |
|
Laurent Destailleur
|
e087ac434d
|
Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
|
2019-11-02 13:34:21 +01:00 |
|
Laurent Destailleur
|
d232b7a387
|
Merge pull request #12286 from grandoc/new_branch_01_11_2019
add some comment
|
2019-11-02 13:00:23 +01:00 |
|
Laurent Destailleur
|
58ffb73627
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-02 12:59:49 +01:00 |
|
Laurent Destailleur
|
45c77b4560
|
Renaming some libelle into label
|
2019-11-02 12:59:38 +01:00 |
|
Laurent Destailleur
|
25e64b0610
|
Merge branch 'develop' into socid
|
2019-11-02 12:01:06 +01:00 |
|
stickler-ci
|
6744f10ff2
|
Fixing style errors.
|
2019-11-02 11:00:43 +00:00 |
|
Laurent Destailleur
|
c12e66e2a2
|
Merge branch 'develop' into new_branch_01_11_2019
|
2019-11-02 12:00:04 +01:00 |
|
stickler-ci
|
dc97a54d82
|
Fixing style errors.
|
2019-11-02 09:39:05 +00:00 |
|
Philippe GRAND
|
8569020e34
|
add some comment
|
2019-11-02 10:30:29 +01:00 |
|
Frédéric FRANCE
|
77d4ca81dc
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-02 09:14:15 +01:00 |
|
Laurent Destailleur
|
cea2c3a9f4
|
Look and feel v11
|
2019-11-01 23:58:14 +01:00 |
|
Philippe GRAND
|
07cd656a1c
|
add some comment
|
2019-11-01 10:56:46 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
866dcf18fe
|
Look and feel v11
|
2019-10-06 15:34:22 +02:00 |
|
Laurent Destailleur
|
2b66282b61
|
NEW Code for extrafields uses the new array $extrafields->attributes
|
2019-10-06 14:41:52 +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 |
|
stickler-ci
|
aed017deab
|
Fixing style errors.
|
2019-09-22 09:36:18 +00:00 |
|
oscim
|
14c98bea15
|
Update livraison.class.php
for correct display object link in card other object (shipping)
|
2019-09-22 11:34:28 +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
|
96fb4c52ea
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
|
2019-08-10 01:43:52 +02:00 |
|
Laurent Destailleur
|
31fa26c2be
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-08-10 01:36:50 +02:00 |
|
atm-greg
|
1d4fc32c20
|
fix second bad test
|
2019-08-05 13:13:56 +02:00 |
|
atm-greg
|
41c07b9b43
|
fix bad test in delivery card
|
2019-08-05 13:10:26 +02:00 |
|
Laurent Destailleur
|
11e3aa5860
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-29 11:07:11 +02:00 |
|
Laurent Destailleur
|
7931f0b422
|
Fix sql error
|
2019-07-29 11:06:39 +02:00 |
|
Laurent Destailleur
|
a5e3adc6f1
|
Fix travis
|
2019-07-29 10:51:17 +02:00 |
|
Laurent Destailleur
|
db461792a0
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-29 01:36:35 +02:00 |
|
Laurent Destailleur
|
9a7113f4f5
|
FIX Update the file index table when we validate/rename a ref.
|
2019-07-28 22:26:55 +02:00 |
|
Laurent Destailleur
|
f5cc29417d
|
Translation lignes -> lines
|
2019-07-05 21:50:35 +02:00 |
|
Laurent Destailleur
|
adb3062a9f
|
Work on nblignes -> nblines
|
2019-06-29 16:38:14 +02:00 |
|
Laurent Destailleur
|
fa476b4994
|
Properties ->libelle_incoterms were renamed into ->label_incoterms
|
2019-06-25 13:00:02 +02:00 |
|
Laurent Destailleur
|
7b01e76d2b
|
Fix doxygen
|
2019-04-08 16:04:15 +02:00 |
|
Laurent Destailleur
|
0ef6fd36f9
|
Merge and clean TakePOS CSS
|
2019-03-15 00:49:44 +01:00 |
|
Laurent Destailleur
|
c44d9bf8e2
|
Fix phpcs
|
2019-03-14 23:27:50 +01:00 |
|
Laurent Destailleur
|
5be2c45d61
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expedition/card.php
htdocs/expedition/shipment.php
htdocs/livraison/card.php
|
2019-03-14 19:23:59 +01:00 |
|
Laurent Destailleur
|
a35a2faacb
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/expedition/card.php
htdocs/livraison/card.php
|
2019-03-14 19:06:21 +01:00 |
|
Marc de Lima Lucio
|
36b44b1348
|
FIX: several hooks in shipping/delivery cards
|
2019-03-12 11:28:36 +01:00 |
|
Frédéric FRANCE
|
207fb2f7d3
|
replace html by html5 in livraison
|
2019-03-03 09:10:26 +01:00 |
|
Frédéric FRANCE
|
0022c4fe72
|
add visibility
|
2019-02-28 22:44:12 +01:00 |
|
Frédéric FRANCE
|
b2e2b2e186
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-31 18:27:27 +01:00 |
|
Laurent Destailleur
|
2bed90e9db
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/sociales/class/chargesociales.class.php
|
2019-01-31 10:24:52 +01:00 |
|
Laurent Destailleur
|
045b8b13ed
|
css
|
2019-01-30 23:20:57 +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
|
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
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|