Commit Graph

64553 Commits

Author SHA1 Message Date
Laurent Destailleur
b128c95a74 NEW Add showempty parameter in country selection 2018-02-13 19:08:46 +01:00
Laurent Destailleur
4f369bd746 NEW Can force usage of shared link for photo of products 2018-02-13 16:34:43 +01:00
Laurent Destailleur
92e67ebb8f Fix svg image preview ko 2018-02-13 16:33:45 +01:00
Laurent Destailleur
35aece060c Search field in correct column 2018-02-13 15:47:17 +01:00
Laurent Destailleur
8a32ae6935 Move ajax_autoselect into functions.lib.php 2018-02-13 15:46:39 +01:00
Laurent Destailleur
7743f88e98 Fix bad escaping 2018-02-13 14:03:11 +01:00
Laurent Destailleur
1a4aa89489 NEW Can share any file from the "Document" tab. 2018-02-13 13:55:36 +01:00
Laurent Destailleur
3b9eaf6a5e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 23:08:23 +01:00
Laurent Destailleur
88bdebb80f Fix label truncated 2018-02-12 23:08:01 +01:00
Laurent Destailleur
36ac380cac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 22:26:48 +01:00
Laurent Destailleur
00a8be22a2 Fix field too small 2018-02-12 22:11:43 +01:00
Laurent Destailleur
a4f48fcfb6 Fix feature must be hidden (not stable) 2018-02-12 16:09:22 +01:00
Laurent Destailleur
1c9f543fd5 Translation 2018-02-12 15:55:37 +01:00
Laurent Destailleur
b2835fc803 Fix check of vat only for european countries 2018-02-12 15:54:24 +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