lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
64,762 Commits 43 Branches 150 Tags 886 MiB
8214e7bb42
Commit Graph

64762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
1daa0204aa Merge pull request #7434 from atm-quentin/6.0 
# Fix #for free line select unit was wrong
 2017-09-20 17:32:08 +02:00
Laurent Destailleur
7706020805 Merge pull request #7446 from hregis/6.0_bug3 
Fix: wrong supplier product price id
 2017-09-20 17:31:10 +02:00
Laurent Destailleur
577c64cc37 WIP work on param download on payment page 2017-09-20 17:23:36 +02:00
Regis Houssin
77fea1983c Fix: wrong supplier product price id 2017-09-20 16:57:38 +02:00
Neil Orley
b62e08efc3 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0-api 2017-09-20 15:40:38 +02:00
Laurent Destailleur
1d6213ea7d Add picto for cheque payment 2017-09-20 15:29:47 +02:00
Regis Houssin
1314e00bc6 Fix: check if array and check empty value if required 2017-09-20 14:46:51 +02:00
Regis Houssin
1f59e4f7e9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-20 12:47:35 +02:00
Laurent Destailleur
5e2cc05047 Prepare 6.0.1 2017-09-20 11:12:47 +02:00
Laurent Destailleur
052e025537 Better detection of log to include merge labels 2017-09-20 11:08:42 +02:00
Pilon David
78b45bd972 Update interface_20_modWorkflow_WorkflowManager.class.php 2017-09-20 09:41:32 +02:00
tysauron
3220225af3 Bug get socid with old object sosciete 2017-09-20 00:53:48 +02:00
tysauron
8bb3130aab For use ajax select company 2017-09-20 00:35:52 +02:00
Laurent Destailleur
cfd29841e1 NEW Option STOCK_SUPPORTS_SERVICES become visible. 2017-09-19 23:42:20 +02:00
Laurent Destailleur
04e1458a3f Fix clean parameters 2017-09-19 22:03:44 +02:00
Laurent Destailleur
8dfa87fcf6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-19 19:30:28 +02:00
Laurent Destailleur
6a0ef4b561 Fix info ot total in direct debit page 2017-09-19 19:29:00 +02:00
Laurent Destailleur
f87614e2d3 Fix missing translation 2017-09-19 19:12:54 +02:00
Laurent Destailleur
ffe2ee8232 Standardize code 2017-09-19 19:00:28 +02:00
fappels
ddeca6cc06 fix oddeven revert 2017-09-19 18:52:27 +02:00
fappels
cec91ae837 Fix extrafield copy receipt 2017-09-19 18:44:49 +02:00
fappels
13d5471dd0 Fix extrafield copy shipment 2017-09-19 18:43:00 +02:00
fappels
8123562ded Fix extrafield copy next situation invoice 2017-09-19 18:42:29 +02:00
Laurent Destailleur
c38ed54990 Disable old datepicker 2017-09-19 17:31:37 +02:00
tysauron
5643d4e867 Rename "->fk_action" in "->type_id" 
(is old name)
 2017-09-19 17:26:18 +02:00
Laurent Destailleur
5f7631a95d NEW Days where user is on vacation use different colors in timesheet. 2017-09-19 17:07:39 +02:00
Laurent Destailleur
14e1306b20 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-19 17:06:03 +02:00
Laurent Destailleur
f4ddce7274 FIX View of timespent for another user 2017-09-19 17:05:50 +02:00
Neil Orley
cc7aee6c3e FIX Implementation of a Luracast recommandation for the REST api server (#7370) 2017-09-19 16:59:19 +02:00
Neil Orley
d5966f944f FIX Implementation of a Luracast recommandation for the REST api server (#7370) 2017-09-19 16:58:09 +02:00
Neil Orley
caf4ca7451 FIX Implementation of a Luracast recommandation for the REST api server (#7370) 2017-09-19 16:56:27 +02:00
Neil Orley
949eef82f0 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0-api 2017-09-19 16:50:55 +02:00
Laurent Destailleur
2a04d497da Use a different css into timespent entry page when user is on holiday 2017-09-19 16:40:55 +02:00
atm-quentin
815d0aff90 FIX for free line select unit was wrong 2017-09-19 15:10:18 +02:00
tysauron
0803e03ca9 For use ajax combobox for societe and contacts in action card create. 2017-09-19 14:53:34 +02:00
Laurent Destailleur
848bc0779a Merge pull request #7430 from atm-florian/6.0 
fix : rest API URL
 2017-09-19 12:19:31 +02:00
Laurent Destailleur
77d1a15016 Activate warning for french "Loi Finance 2016" 2017-09-19 12:03:48 +02:00
Laurent Destailleur
f5bc9c08b1 Missing css 2017-09-19 11:38:28 +02:00
Darkjeff
e8bd0c8f6b Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2017-09-19 09:13:57 +02:00
Maxime Kohlhaas
5018bf1baf Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0 2017-09-19 09:13:22 +02:00
florian HENRY
7375afca3e fix : rest API URL 2017-09-19 09:03:25 +02:00
Laurent Destailleur
0b67ac36f1 Show image on tool page 2017-09-19 02:01:05 +02:00
Laurent Destailleur
978702d04b Fix false deprecated warning 2017-09-19 01:41:57 +02:00
Laurent Destailleur
b723d2c2d2 Fix scrutinizer bugs 2017-09-19 01:39:22 +02:00
Laurent Destailleur
89bfb81cc7 Fix repair 2017-09-19 01:05:13 +02:00
Laurent Destailleur
1e33495f42 Fix remove warnings 2017-09-19 00:31:51 +02:00
Laurent Destailleur
ed932db3a3 Merge pull request #7426 from hregis/develop_bug 
Fix: avoid Warning: A non-numeric value encountered
 2017-09-19 00:27:40 +02:00
Laurent Destailleur
777e1e1efa Merge pull request #7429 from Gitdyr/develop 
Fix: Changed "Solde" to "Balance"
 2017-09-19 00:25:40 +02:00
Laurent Destailleur
f936b17d68 FIX Protection to avoid to apply credit note discount > remain to pay 2017-09-19 00:24:52 +02:00
Laurent Destailleur
9838199de1 FIX Sign of amount in origin currency on credit note created from lines 2017-09-18 23:53:17 +02:00