Laurent Destailleur
|
af9e2d07d2
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/compta/paiement.php
htdocs/fourn/facture/paiement.php
|
2019-02-03 20:38:47 +01:00 |
|
Laurent Destailleur
|
4b77b3ff23
|
NEW Support tag {ccc} on payment ref
|
2019-02-03 20:36:20 +01:00 |
|
Laurent Destailleur
|
2c71e6b19a
|
Merge pull request #10426 from frederic34/nospaceaftercomma
PSR2 wants space after comma in function calls
|
2019-02-03 19:27:35 +01:00 |
|
Laurent Destailleur
|
a6dde3d6bd
|
Merge branch 'develop' into nospaceaftercomma
|
2019-02-03 19:27:16 +01:00 |
|
Laurent Destailleur
|
3a5372b59c
|
Merge pull request #10484 from andreubisquerra/master
CSS improvements and Takepos setup check
|
2019-02-03 19:16:08 +01:00 |
|
Laurent Destailleur
|
8dd64b0dc1
|
Update takepos.php
|
2019-02-03 19:15:41 +01:00 |
|
Laurent Destailleur
|
9f7dfe2921
|
Merge pull request #10481 from frederic34/psr2forloop
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
|
2019-02-03 19:11:07 +01:00 |
|
Laurent Destailleur
|
49d695c9b2
|
Merge pull request #10479 from frederic34/patch-2
remove psr2 warning for else if usage
|
2019-02-03 19:06:38 +01:00 |
|
Laurent Destailleur
|
23866e0722
|
Merge pull request #10482 from frederic34/patch-17
FIX add missing require date.lib.php
|
2019-02-03 19:05:57 +01:00 |
|
Laurent Destailleur
|
326996d392
|
Merge pull request #10488 from frederic34/PSR2EndFileNewlineNoneFound
psr2 end file new line none found
|
2019-02-03 19:04:28 +01:00 |
|
Laurent Destailleur
|
aa821634ec
|
Merge pull request #10489 from frederic34/patch-18
$this->get($id) return array not int
|
2019-02-03 19:03:42 +01:00 |
|
Laurent Destailleur
|
afd53a99c2
|
Fix merge
|
2019-02-03 18:21:03 +01:00 |
|
Laurent Destailleur
|
e309261140
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-03 18:19:58 +01:00 |
|
Laurent Destailleur
|
456e78b7cf
|
FIX #10485
|
2019-02-03 17:45:31 +01:00 |
|
Frédéric FRANCE
|
e3a5d2b839
|
get return array not int
|
2019-02-03 16:39:48 +01:00 |
|
Frédéric FRANCE
|
273d68381c
|
psr2 end file new line none found
|
2019-02-03 15:21:21 +01:00 |
|
andreubisquerra
|
8b1b8bb7a3
|
CSS improvements and Takepos setup check
|
2019-02-02 23:57:38 +01:00 |
|
Frédéric FRANCE
|
a5af92cff1
|
add missing require date.lib.php
|
2019-02-02 18:33:48 +01:00 |
|
Frédéric FRANCE
|
03701fa091
|
psr2
|
2019-02-02 18:25:01 +01:00 |
|
Frédéric FRANCE
|
80b48680f6
|
clean missing spaces in the last merge
|
2019-02-02 09:49:07 +01:00 |
|
Frédéric FRANCE
|
2f40443b46
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-02 09:46:14 +01:00 |
|
Frédéric FRANCE
|
25abceb116
|
remove psr2 warning for else if usage
|
2019-02-02 08:59:37 +01:00 |
|
Frédéric FRANCE
|
96de1b175c
|
clean missing spaces in the last merge
|
2019-02-02 08:51:30 +01:00 |
|
Frédéric FRANCE
|
bd8d81a96e
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-02 07:49:41 +01:00 |
|
Laurent Destailleur
|
28c1b1ce58
|
Work on billing time spent
|
2019-02-01 22:39:36 +01:00 |
|
Laurent Destailleur
|
ebe30f7a0e
|
FIX error report not returned
|
2019-02-01 19:19:23 +01:00 |
|
Laurent Destailleur
|
2e5382f40d
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-01 18:39:27 +01:00 |
|
Frédéric FRANCE
|
f5b2cf75f2
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-01 18:31:44 +01:00 |
|
Laurent Destailleur
|
c313ad6195
|
Fix phpcs
|
2019-02-01 18:19:39 +01:00 |
|
Laurent Destailleur
|
044e617667
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-01 18:17:09 +01:00 |
|
Laurent Destailleur
|
9d03f4b228
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-01 18:17:02 +01:00 |
|
Laurent Destailleur
|
a2ab6348ed
|
Fix bad menu leading on a development page
|
2019-02-01 17:06:34 +01:00 |
|
Laurent Destailleur
|
b83ff06db8
|
FIX #10416 No need of another option
|
2019-02-01 17:00:04 +01:00 |
|
Laurent Destailleur
|
08050434a1
|
Merge pull request #10435 from wdammak/patch-22
Wrapping for stock movements
|
2019-02-01 16:11:37 +01:00 |
|
Laurent Destailleur
|
3fc49a9de2
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-01 16:07:27 +01:00 |
|
Laurent Destailleur
|
6de732d7f8
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
|
2019-02-01 16:07:18 +01:00 |
|
Laurent Destailleur
|
35f65a571c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
htdocs/fourn/commande/list.php
|
2019-02-01 16:05:43 +01:00 |
|
Laurent Destailleur
|
e366ab551c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-02-01 16:01:26 +01:00 |
|
Laurent Destailleur
|
dee2a373c1
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
|
2019-02-01 16:01:18 +01:00 |
|
Laurent Destailleur
|
dbf7ae4c25
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2019-02-01 15:56:58 +01:00 |
|
Laurent Destailleur
|
452dfafd32
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2019-02-01 15:56:47 +01:00 |
|
Laurent Destailleur
|
bff2f33022
|
Merge pull request #10404 from atm-john/6.0_fix_supplier_order_line_fetch
Fix fetch test
|
2019-02-01 15:56:26 +01:00 |
|
Laurent Destailleur
|
235c4ccd4d
|
Merge pull request #10462 from grandoc/new_branch_30_01_2019
New branch 30 01 2019
|
2019-02-01 15:54:43 +01:00 |
|
Laurent Destailleur
|
affdc08848
|
Merge branch 'develop' into new_branch_30_01_2019
|
2019-02-01 15:54:36 +01:00 |
|
Laurent Destailleur
|
b9dc803911
|
Merge pull request #10432 from grandoc/new_branch_27_01_2019
update with html5 compliant code
|
2019-02-01 15:50:49 +01:00 |
|
Laurent Destailleur
|
0ed74ee8de
|
Merge pull request #10476 from fappels/10_work_on_supplier_price_history
Fix travis
|
2019-02-01 15:46:29 +01:00 |
|
Laurent Destailleur
|
dbab955cbd
|
Merge pull request #10471 from mapiolca/patch-9
#Fix : Error in Total Products/Services
|
2019-02-01 15:43:47 +01:00 |
|
Laurent Destailleur
|
62e9c3fb09
|
Merge pull request #10475 from fappels/10_work_on_supplier_price_history
Work on #10394 log supplier prices
|
2019-02-01 15:41:36 +01:00 |
|
Francis Appels
|
cf9d87df4a
|
Fix travis
|
2019-02-01 15:40:56 +01:00 |
|
Laurent Destailleur
|
cf89fbd165
|
Merge pull request #10474 from ATM-Nicolas/new_contact_related_item_tab
New contact related item tab
|
2019-02-01 15:39:39 +01:00 |
|