Commit Graph

57102 Commits

Author SHA1 Message Date
Laurent Destailleur
64dc44b796 FIX Value of payment term and project are not set on correct default
value when invoice generated from template.
2016-09-19 16:27:01 +02:00
Laurent Destailleur
c4c7ccc226 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/societe/note.php
	htdocs/societe/rib.php
2016-09-19 14:05:16 +02:00
Laurent Destailleur
4f842fd2cb Uniformize look and feel 2016-09-19 13:57:50 +02:00
Laurent Destailleur
079ed88119 Fix missing css 2016-09-19 13:57:18 +02:00
Laurent Destailleur
5602bcd440 NEW Add status Done on interventions 2016-09-19 13:09:50 +02:00
Laurent Destailleur
af28a67803 Uniformize look using dol_banner 2016-09-19 10:43:30 +02:00
Laurent Destailleur
6cae631a4f NEW Add REST API to read users 2016-09-19 02:13:16 +02:00
Laurent Destailleur
77e2037195 NEW Add REST API to read, create and delete agenda events 2016-09-19 02:02:45 +02:00
Laurent Destailleur
b076ea2985 Code comment 2016-09-19 00:49:29 +02:00
Laurent Destailleur
7ac1b712e0 Start to work on sepa mandate generation 2016-09-19 00:39:46 +02:00
Laurent Destailleur
95f2cae825 Start to work on sepa mandate generation 2016-09-19 00:26:30 +02:00
Laurent Destailleur
0c342284f0 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-18 22:01:14 +02:00
Laurent Destailleur
5fb55cc9de Fix css 2016-09-18 22:00:59 +02:00
Laurent Destailleur
c4626b0826 CSS 2016-09-18 21:48:00 +02:00
Laurent Destailleur
c8b8e13014 Work on dol_banner for proposals. 2016-09-18 21:38:20 +02:00
Laurent Destailleur
46ce1d3a69 Uniformize code 2016-09-18 16:11:30 +02:00
Laurent Destailleur
537c6b0cc7 Uniformize code 2016-09-18 15:57:53 +02:00
Asier Bilbao
0a9fd2dc7e Fix Syntax error, unrecognized expression: input.remain]
Fix
```
 jquery.min.js?version=4.0.0:2 Uncaught Error: Syntax error, unrecognized expression: input.remain]
```
2016-09-18 15:51:55 +02:00
Laurent Destailleur
13c3db08e7 Uniformize code and look and feel 2016-09-18 15:48:29 +02:00
Laurent Destailleur
7e24f449d2 Can filter on project category on project list 2016-09-18 15:36:38 +02:00
Laurent Destailleur
d1c4f02bf7 Uniformize code and style 2016-09-18 14:41:17 +02:00
Laurent Destailleur
a4c3a4588d FIX link "back to list" was not visible. 2016-09-18 14:12:49 +02:00
Laurent Destailleur
6093dfe333 Uniformize code 2016-09-18 12:33:30 +02:00
Laurent Destailleur
61d32b7fb6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-17 21:03:56 +02:00
Laurent Destailleur
97e396af69 Work on module website 2016-09-17 21:03:20 +02:00
Laurent Destailleur
407d9e6904 Merge pull request #5741 from atm-quentin/new_hook_stock_product_develop_dolibarr
NEW Hook on stock product card
2016-09-17 18:04:39 +02:00
Laurent Destailleur
3a0db4afed Merge pull request #5755 from defrance/patch-27
Prevent space separator in module definition
2016-09-17 17:55:51 +02:00
Laurent Destailleur
bef5c2748c Merge pull request #5756 from atm-maxime/fix_pgsql_supplierorder_list
FIX No ORDER BY needed for a COUNT sql, causes PGSQL error
2016-09-17 17:49:19 +02:00
Laurent Destailleur
7afdfd5a68 Merge pull request #5758 from joseplluis/patch-3
Minor fix: incorrect key translations
2016-09-17 17:48:01 +02:00
Laurent Destailleur
81590e3833 Merge pull request #5757 from IonAgorria/fix-sorder-insert
FIX: Wrong line insert trigger in supplier order
2016-09-17 17:47:16 +02:00
Laurent Destailleur
83ba44c418 Merge pull request #5759 from IonAgorria/fix-sorder-delete
FIX: Move order supplier deleteline code to line class
2016-09-17 17:44:33 +02:00
Ion Agorria
7fe0c4211c Move order supplier deleteline code to line class 2016-09-17 02:35:02 +02:00
gauthier
7a0577ccfc NEW : add limit stock product by warehouse 2016-09-16 17:09:38 +02:00
Juanjo Menent
d0d14ea959 Merge pull request #5753 from olsesacl/4.0
FIX: #5699 Error when creating database backup dump file
2016-09-16 17:08:48 +02:00
Josep Lluís
1b05be0305 Minor fix: incorrect key translations
"Post" key doesn't exist: Changed to "PostOrFunction"
"Email" key doesn't exist: Changed to "EMail"
"DateCreate" changed to "DateCreateShort" in $arrayfields (with the same key in print_liste_field_titre function)
2016-09-16 17:07:01 +02:00
Laurent Destailleur
d0136f5c85 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/websites/index.php
2016-09-16 01:23:54 +02:00
Laurent Destailleur
72aacb81ae NEW Can use native php and dolibarr object on pages of module website. 2016-09-16 01:13:52 +02:00
Laurent Destailleur
a97161b044 NEW Can use native php and dolibarr object on pages of module website. 2016-09-16 01:00:24 +02:00
Ion Agorria
54756ef729 Fix wrong trigger in supplier order 2016-09-15 23:45:13 +02:00
Laurent Destailleur
68b3de5b37 NEW ckeditor accept a parameter to disable all html filtering 2016-09-15 23:23:10 +02:00
Laurent Destailleur
8a32391171 Work on website module 2016-09-15 19:27:04 +02:00
Maxime Kohlhaas
5840ed8258 No ORDER BY needed for a COUNT sql, causes PGSQL error 2016-09-15 12:08:47 +02:00
BENKE Charlie
3d8f756646 prevent space separator in module definition
If we type in definition of dictionnary "code,libelle, color" we can't insert/update value... 
propose to allow typing space bettween field (better lisibility) and remove space after
2016-09-15 10:51:48 +02:00
Laurent Destailleur
621ba7b76f Work on module website 2016-09-15 09:33:00 +02:00
Sergio Sanchis Climent
93b216e628 FIX: #5699 2016-09-15 05:18:08 +02:00
Laurent Destailleur
22df7d7a68 Work on module website 2016-09-14 23:42:17 +02:00
Laurent Destailleur
4228a51f18 Work on module website 2016-09-14 23:23:22 +02:00
Laurent Destailleur
5146a0ce56 Fix filter on num account statement 2016-09-14 21:29:08 +02:00
Laurent Destailleur
145c1e1cc8 NEW Add account statement into fields of bank account transaction list 2016-09-14 21:26:57 +02:00
Laurent Destailleur
630aab9124 NEW Can select fields to show on list of bank transaction 2016-09-14 21:06:16 +02:00