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

64540 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gerhard Stephan
2aaf3a466d Load product data optional fields to the line -> enables to use "line_options_{extrafield}" 
This fixes the issue #3185
https://github.com/Dolibarr/dolibarr/issues/3185
 2018-02-12 21:38:51 +01:00
Laurent Destailleur
fda5822d5a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 14:03:22 +01:00
Laurent Destailleur
30ba1c1702 FIX #8174 2018-02-12 14:02:51 +01:00
Laurent Destailleur
2fc97e5c8c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 14:01:34 +01:00
Laurent Destailleur
12e48e07ae Fix deletion of ledger line when editing transaction 2018-02-12 13:50:26 +01:00
Laurent Destailleur
284e6f1ad3 Better position of error check 2018-02-12 13:39:06 +01:00
Laurent Destailleur
caa136bed3 FIX Debug journalization: Avoid journalizing if all lines not bound 2018-02-12 13:31:32 +01:00
Laurent Destailleur
09dfd5eb9f Fix journalization protection 2018-02-12 12:02:01 +01:00
Laurent Destailleur
734bd4d2fb Fix menu visible in dev only 2018-02-12 10:15:58 +01:00
Laurent Destailleur
6bdb82cf27 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/class/api_thirdparties.class.php
 2018-02-12 04:15:47 +01:00
Laurent Destailleur
60a848de5a Fix bad list of id for supplier categories 2018-02-12 04:09:15 +01:00
Laurent Destailleur
64f61c80ad Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-12 04:08:13 +01:00
Laurent Destailleur
55779e3b55 Fix confusion between supplier and customer categories 2018-02-12 04:07:45 +01:00
Laurent Destailleur
aaf4db2e03 Fix API on thirdparty categories 2018-02-12 04:05:51 +01:00
Laurent Destailleur
f637269a27 Fix bad list of id for supplier categories 2018-02-12 04:05:13 +01:00
Laurent Destailleur
9b8b3a1236
Merge pull request #8176 from hregis/7.0_bug2 
Fix: wrong param name (Travis error !)
 2018-02-12 03:25:23 +01:00
Laurent Destailleur
b23ef5fd8f
Merge pull request #8175 from hregis/7.0_bug 
Fix: check perms by type of product
 2018-02-12 03:25:08 +01:00
Laurent Destailleur
7f4adb7f97
Update card.php 2018-02-12 03:23:57 +01:00
Laurent Destailleur
976241da61 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 03:21:48 +01:00
Laurent Destailleur
109c447171 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 03:21:37 +01:00
Laurent Destailleur
975608b9d3 FIX #8174 2018-02-12 03:21:04 +01:00
Laurent Destailleur
3d3e3809f4
Merge pull request #8173 from Ysandor/patch-1 
NEW [REST API] Add the possibility to remove a category from a thirdparty
 2018-02-12 03:15:55 +01:00
Laurent Destailleur
671fbd3d55 Code comment 2018-02-12 02:59:18 +01:00
Laurent Destailleur
c03ceb2205 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-12 02:56:51 +01:00
Laurent Destailleur
12f1e4c04b
Merge pull request #8167 from atm-john/fix_contract_line_extrafields_on_save 
Fix Missing insert of extrafields on contract add line
 2018-02-12 02:56:19 +01:00
Laurent Destailleur
5512e279ca
Merge pull request #8165 from atm-quentin/6.0 
NEW doActions on categorycard
 2018-02-12 02:55:31 +01:00
Laurent Destailleur
d3d3bcaca5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-12 02:53:21 +01:00
Laurent Destailleur
f88874c1f7 Code comment 2018-02-12 02:53:08 +01:00
Romain DESCHAMPS
8e42ed5824 add missing links in cust. card boxes 2018-02-12 02:40:13 +01:00
Romain DESCHAMPS
37ff46b05a add missing links in supplier card boxes 2018-02-12 02:40:09 +01:00
Laurent Destailleur
c7f7fe497b
Merge pull request #8162 from RomainDeschamps/patch-6 
add missing links in cust. card boxes
 2018-02-12 02:38:35 +01:00
Laurent Destailleur
821311657e
Merge pull request #8161 from RomainDeschamps/patch-5 
add missing links in supplier card boxes
 2018-02-12 02:37:39 +01:00
Laurent Destailleur
1757d4922c
Merge pull request #8158 from atm-john/new_contract_dom_elements 
New contract dom elements
 2018-02-12 02:36:30 +01:00
Laurent Destailleur
5c59f5c63b
Merge pull request #8159 from atm-ph/fix_6.0_cant_update_nblignes_on_pdf_creation 
Fix can't update $nblignes on beforePDFCreation if we update $object->lines
 2018-02-12 02:34:52 +01:00
Laurent Destailleur
fa3b1c74a9 Fix bad link 2018-02-12 02:25:34 +01:00
Laurent Destailleur
1300f7172f NEW Can fix the bank account of a payment if payment not conciliated 2018-02-12 02:17:52 +01:00
Laurent Destailleur
1a6cff8fee Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 01:28:14 +01:00
Laurent Destailleur
b7b496132b Fix syntax error 2018-02-12 01:27:54 +01:00
Regis Houssin
3525306cc4 Fix: wrong var name 2018-02-11 13:29:37 +01:00
Regis Houssin
86df1ddd0a Fix: uniformize user rights check 2018-02-11 13:27:02 +01:00
Regis Houssin
2b7693c582 Fix: wrong param name (Travis error !) 2018-02-11 12:14:23 +01:00
Regis Houssin
01b3b8e09e Fix: check perms by type of product 2018-02-11 12:09:12 +01:00
Ysandor
b48d369258
add the possibility to remove a category from a thirdparty 
I don't know if there is a good reason for not proposing to unlink a thirdparty from a category but if it is not the case here is a piece of code allowing to remove a category that works for me and seems general enough to be useful to other people.
The new function is inspired from the addCategory function.

PS : This is the first time i'm trying to contribute on github so don't hesitate to tell me if I did something wrong.
 2018-02-10 20:38:53 +01:00
Laurent Destailleur
e25bd56e22 Add option WEBSITE_USE_WEBSITE_ACCOUNTS 2018-02-10 12:16:06 +01:00
Laurent Destailleur
ec66bde3c9 Add option WEBSITE_USE_WEBSITE_ACCOUNTS 2018-02-10 12:15:24 +01:00
Laurent Destailleur
74116f495e CSS enhancement 2018-02-10 00:05:04 +01:00
Laurent Destailleur
01f09e6c09 CSS enhancement 2018-02-10 00:04:05 +01:00
Laurent Destailleur
2315997aad CSS enhancement 2018-02-10 00:00:12 +01:00
Laurent Destailleur
e984d7df9f NEW Add total of time spent in timespent page at top of page too. 2018-02-09 23:52:43 +01:00
Laurent Destailleur
633dc507fe NEW Use a css style for weekend in time spent 2018-02-09 20:11:32 +01:00