Commit Graph

74753 Commits

Author SHA1 Message Date
Laurent Destailleur
626e852888
Merge pull request #10892 from andreubisquerra/master
Fix a previous commit that causes TakePOS not work
2019-03-21 18:28:43 +01:00
Laurent Destailleur
aa33e4fd2a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-21 18:26:29 +01:00
Laurent Destailleur
55d64d441f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-21 18:26:02 +01:00
Laurent Destailleur
1075ef8cf2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-21 18:25:43 +01:00
Mathieu Pellegrin
e0d89101df #9480 Password link broken if login contains space 2019-03-21 18:25:00 +01:00
Laurent Destailleur
0d139890e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-21 18:24:43 +01:00
Laurent Destailleur
6c2bd13b58
Merge pull request #10895 from mpellegrin/develop
#9480 Password link broken if login contains space
2019-03-21 18:24:21 +01:00
Laurent Destailleur
805493f43d
Merge pull request #10894 from grandoc/new_branch_20_03_2019
update with html5 compliant code
2019-03-21 18:23:40 +01:00
Laurent Destailleur
f7f20df323
Merge pull request #10891 from atm-greg/Add_hook_on_replenish
Add hook on replenish
2019-03-21 18:23:06 +01:00
Laurent Destailleur
2995f9c49d
Merge pull request #10890 from frederic34/patch-2
phpcs fix v9
2019-03-21 18:22:36 +01:00
Laurent Destailleur
47eb256b82 Fix phpcs 2019-03-21 18:22:17 +01:00
Laurent Destailleur
65133164bd
Merge pull request #10889 from grandoc/new_branch_19_03_2019
New branch 19 03 2019
2019-03-21 18:20:52 +01:00
Laurent Destailleur
930720decd WIP Start to replace use of property ->brouillon 2019-03-21 18:13:51 +01:00
Laurent Destailleur
90df30e412 NEW Add trigget FICHINTER_UNVALIDATE
Standardize code of setDraft.
2019-03-21 17:37:56 +01:00
Laurent Destailleur
a1fe1bb58c FIX when 2 extra fields are mandatory in 2 different entities 2019-03-21 12:33:39 +01:00
Laurent Destailleur
5d21547854 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/product/price.php
	htdocs/user/perms.php
2019-03-21 12:20:24 +01:00
Laurent Destailleur
a7fdd34973 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-21 12:17:50 +01:00
Laurent Destailleur
032aa869e4 FIX Can't insert if there is extrafields mandatory on another entity.
FIX Can't set default value of extrafield of type varchar
2019-03-21 12:14:15 +01:00
Mathieu Pellegrin
e971018c71
#9480 Password link broken if login contains space 2019-03-21 12:06:43 +01:00
Laurent Destailleur
4c85068a85 FIX Can't insert if there is extrafields mandatory on another entity. 2019-03-21 11:53:04 +01:00
Philippe GRAND
e17ab64dbd update with html5 compliant code 2019-03-20 09:56:17 +01:00
Philippe GRAND
569be67317 update with html5 compliant code 2019-03-20 09:55:34 +01:00
Philippe GRAND
dee46173ff update with html5 compliant code 2019-03-20 09:53:29 +01:00
Philippe GRAND
5e6b451195 update with html5 compliant code 2019-03-20 09:52:33 +01:00
Philippe GRAND
963847c89c update with html5 compliant code 2019-03-20 09:49:38 +01:00
Philippe GRAND
644743dce8 update with html5 compliant code 2019-03-20 09:47:06 +01:00
Philippe GRAND
427a3fc02d update with html5 compliant code 2019-03-20 09:35:16 +01:00
Philippe GRAND
819253abee update with html5 compliant code 2019-03-20 09:32:57 +01:00
Philippe GRAND
6aa4e82e20 update with html5 compliant code 2019-03-20 09:31:28 +01:00
Philippe GRAND
e519bfc64b update with html5 compliant code 2019-03-20 09:27:28 +01:00
andreubisquerra
3665e9137a In a previous commit the command to change 'ref' has been deleted. And now TakePOS don't work.
In Dolibarr the next command not work on draft invoice:
$invoice->ref = "(PROV-POS-".$place.")";
So I return to the previous command:
$sql="UPDATE ".MAIN_DB_PREFIX."facture set ref='(PROV-POS-".$place.")' where rowid=".$placeid;
2019-03-19 23:05:08 +01:00
Frédéric FRANCE
89e8889c5c
phpcs fix v9 2019-03-19 16:33:34 +01:00
Laurent Destailleur
3c1d7bfbf0 FIX counter of permissions in badge was wrong 2019-03-19 16:30:40 +01:00
Laurent Destailleur
23ce97fb2d NEW Introduce css "nobottomiftotal" 2019-03-19 16:01:03 +01:00
Laurent Destailleur
51eab7e2f8 Fix rename tag 2019-03-19 15:21:07 +01:00
Laurent Destailleur
9745bd1f16 NEW Add tag for ODT generation for localtax rates 2019-03-19 15:18:43 +01:00
Laurent Destailleur
161d8aa22f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-19 14:23:08 +01:00
Laurent Destailleur
70c2ffc816 FIX toggle of login_block was ko with eldy theme 2019-03-19 14:22:57 +01:00
Philippe GRAND
8563d1e867 update with html5 compliant code 2019-03-19 14:19:40 +01:00
Philippe GRAND
1a21799585 update with html5 compliant code 2019-03-19 14:19:01 +01:00
Philippe GRAND
c9cd4260d6 update with html5 compliant code 2019-03-19 14:17:59 +01:00
Philippe GRAND
11c66a88bc update with html5 compliant code 2019-03-19 14:17:20 +01:00
Philippe GRAND
200e7172ad update with html5 compliant code 2019-03-19 14:16:42 +01:00
Philippe GRAND
e2e77f2a53 update with html5 compliant code 2019-03-19 14:15:24 +01:00
Philippe GRAND
ab267497ce update with html5 compliant code 2019-03-19 14:13:51 +01:00
Philippe GRAND
5775d84a7f update with html5 compliant code 2019-03-19 14:13:21 +01:00
Philippe GRAND
5073e75b4a update with html5 compliant code 2019-03-19 14:12:12 +01:00
Philippe GRAND
e8430ca586 update with html5 compliant code 2019-03-19 14:06:54 +01:00
Philippe GRAND
36d8976439 update with html5 compliant code 2019-03-19 13:58:09 +01:00
Philippe GRAND
33b7965741 update with html5 compliant code 2019-03-19 13:57:08 +01:00