Commit Graph

64295 Commits

Author SHA1 Message Date
Darkjeff
c6d0cad2f5 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2017-10-02 09:56:19 +02:00
gauthier
8f969d61e2 FIX : invalid foreach protection 2017-10-02 09:23:04 +02:00
florian HENRY
18bd2c4445 fix travis 2017-10-02 09:04:22 +02:00
Regis Houssin
475c881e67 Fix: add missing ldap fields 2017-10-02 09:00:07 +02:00
Regis Houssin
c1b6f59c1b Fix: restore possible ldap keys 2017-10-02 08:43:53 +02:00
Laurent Destailleur
26e537e328 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-10-02 01:28:31 +02:00
Laurent Destailleur
7c30b3ca5d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-10-02 01:28:20 +02:00
Laurent Destailleur
ea5c54ad9c Merge pull request #7525 from hregis/5.0_bug2
Fix: two errors when you create invoice from shipping
2017-10-02 01:25:35 +02:00
Laurent Destailleur
ec8db116f8 Update llx_c_type_contact.sql 2017-10-02 01:25:28 +02:00
Laurent Destailleur
884fc5d249 Update facture.class.php 2017-10-02 01:25:00 +02:00
Laurent Destailleur
989f285d32 Replace table with div 2017-10-02 01:23:07 +02:00
Laurent Destailleur
3f3a5e0921 Merge pull request #7499 from atm-gauthier/NEW_custom_meteo
New custom meteo
2017-10-02 00:48:52 +02:00
Laurent Destailleur
88554a74a9 Merge pull request #7532 from AXeL-dev/develop
Fix: payment form & user first/last name position
2017-10-02 00:37:35 +02:00
Laurent Destailleur
6dbc02022f Merge pull request #7529 from Nicos-git/develop
NEW: Add project related fields to ODT
2017-10-02 00:36:46 +02:00
Laurent Destailleur
48c3d0e3f2 Update commondocgenerator.class.php 2017-10-02 00:36:15 +02:00
Laurent Destailleur
f15ce54c05 Update commondocgenerator.class.php 2017-10-02 00:34:55 +02:00
Laurent Destailleur
b5bfc3e2c7 Merge pull request #7528 from aspangaro/6.0-agiris2
FIX Accountancy export model for Agiris Isacompta
2017-10-02 00:33:13 +02:00
Laurent Destailleur
be84b52d19 Merge pull request #7518 from atm-ph/fix_5.0_hookmanager_situation_invoice
Fix the pdf_getlineprogress hook isn't use because hookmanager is null
2017-10-02 00:14:34 +02:00
Laurent Destailleur
7c690ae8b8 Merge pull request #7517 from simnandez/5.0
FIX: #7510 Bug: extrafield content disappear when generate pdf within intervention
2017-10-02 00:14:05 +02:00
Laurent Destailleur
c118f4a317 Merge pull request #7511 from Oeris/develop-api
NEW Get a list of payments terms
2017-10-02 00:13:30 +02:00
Laurent Destailleur
a81d458829 Merge pull request #7509 from dolibarr95/patch-21
NEW Add the attribute accept to the input form for file upload
2017-10-02 00:12:03 +02:00
Laurent Destailleur
17b286ef59 Merge pull request #7508 from atm-arnaud/FIX_replenish_stock_line_0
FIX replenish if line test GETPOST on line 0
2017-10-02 00:10:55 +02:00
Laurent Destailleur
03c08b1de4 Merge pull request #7507 from dolibarr95/patch-20
Line missing (error 500)
2017-10-02 00:10:03 +02:00
Laurent Destailleur
94ae6c62e6 Add htmlheader field for each page 2017-10-02 00:08:00 +02:00
Laurent Destailleur
e13f29b4c8 Add ID of page 2017-10-01 21:29:49 +02:00
Laurent Destailleur
8180967652 Enhance fetch of external page for module website 2017-10-01 20:37:41 +02:00
AXeL-dev
46800afac9 FIX: missing variables in payment form 2017-10-01 18:38:08 +01:00
AXeL-dev
f7dcf1ca45 FIX: wrong user first name/last name position in user tooltip 2017-10-01 18:35:06 +01:00
AXeL-dev
5df0f4c2fd FIX: in payment form, label does not fill with GET method 2017-10-01 18:33:22 +01:00
Laurent Destailleur
f785203c0d Creating a page from an external url can grab images too. 2017-10-01 18:27:54 +02:00
Laurent Destailleur
b3939f12b9 Enhance the default value feature 2017-10-01 15:06:43 +02:00
Laurent Destailleur
3ddd5d3d3a The default value feature is sensitive to url parameters. 2017-10-01 14:54:17 +02:00
Nicolas Leichtle
629c6d93f6 FIX: REST function addTimeSpent 2017-10-01 14:33:59 +02:00
Laurent Destailleur
b7810d95b9 Fix permissions 2017-09-30 20:43:15 +02:00
Laurent Destailleur
2c1f1ec651 Try to fix autocomplete 2017-09-30 20:31:20 +02:00
Laurent Destailleur
e23a88732e Fix default value on extrafields 2017-09-30 20:05:34 +02:00
Laurent Destailleur
47c0231fb8 Fix error management 2017-09-30 19:12:12 +02:00
Laurent Destailleur
a43dcbd0c5 Fix no "now" link on search of a date extrafield in list 2017-09-30 18:57:21 +02:00
Laurent Destailleur
976cbd5f83 Fix javascript error and input field for password extrafield in list 2017-09-30 18:52:33 +02:00
Laurent Destailleur
9ba8b9bf7e Fix stay on create form if creation fails 2017-09-30 18:19:20 +02:00
Nicolas Leichtle
95cc007b39 NEW: Add project related fields to ODT 2017-09-30 15:40:17 +02:00
Laurent Destailleur
fa6c3eff80 More PHPunit on invoice deletion 2017-09-30 12:53:24 +02:00
Laurent Destailleur
0feae17ef5 Fix file not always defined 2017-09-30 11:51:34 +02:00
Regis Houssin
cb9d627f02 Fix: Set LDAP password when LDAP key changed 2017-09-30 11:51:22 +02:00
Regis Houssin
46cc23c568 Fix: $this->pass is empty if DATABASE_PWD_ENCRYPTED is used 2017-09-30 10:41:35 +02:00
Regis Houssin
df1603de6d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-30 08:56:50 +02:00
Alexandre SPANGARO
6a05645295 Fix : Accountancy export model for Agiris Isacompta 2017-09-30 06:58:31 +02:00
Laurent Destailleur
0e15aef44f CSS 2017-09-30 00:30:58 +02:00
Regis Houssin
4a63e6b6ec Fix: two errors when you create invoice from shipping 2017-09-29 19:07:13 +02:00
Laurent Destailleur
02f069713e Standardize code 2017-09-29 17:43:32 +02:00