Commit Graph

22 Commits

Author SHA1 Message Date
Regis Houssin
1befd9c67f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict

Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-23 21:05:36 +02:00
Laurent Destailleur
4c243d3b9e Fix index declaration must be moved into the .key.sql files. 2017-08-23 15:18:54 +02:00
Regis Houssin
2f537a1ade Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict

Conflicts:
	htdocs/compta/charges/index.php
	htdocs/compta/paiement/list.php
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-22 18:49:40 +02:00
Laurent Destailleur
188653a85d Work on website module 2017-08-20 18:50:51 +02:00
florian HENRY
8fd45383e2 NEW : manageme extrafields with multientity 2017-08-04 09:00:11 +02:00
Laurent Destailleur
a8d9dff506 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-31 19:32:08 +02:00
Laurent Destailleur
d2b662c671 Add field fk_user in bookkeeping (the user who valiated the accounting
document. Will be used for statistics purpose only).
2017-07-31 19:31:52 +02:00
Regis Houssin
0dc0fe81fc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
2017-07-31 07:40:01 +02:00
Laurent Destailleur
69357dd91c Merge pull request #7113 from atm-ph/new_develop_expense_report
NEW Add expense report rules and ik
2017-07-31 02:33:49 +02:00
Laurent Destailleur
46586f3055 Can export Websites pages.
Work on export to be able to use the generic declaration of fields.
2017-07-28 14:54:13 +02:00
atm-ph
1f3f9e40b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report 2017-07-27 16:01:53 +02:00
Regis Houssin
acd5780e32 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
2017-07-26 08:58:56 +02:00
Laurent Destailleur
fb5a7370bf Add missing field 2017-07-25 21:40:55 +02:00
Laurent Destailleur
67a442cd9a Uniformize fields 2017-07-24 11:53:57 +02:00
Regis Houssin
2efb86b5d8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
2017-07-23 10:36:14 +02:00
Laurent Destailleur
437d620fe4 Add support of language in website module 2017-07-22 20:01:29 +02:00
Regis Houssin
26df1389f4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict

Conflicts:
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-07-21 20:42:21 +02:00
Laurent Destailleur
aacef21cb8 Can clone a page 2017-07-21 13:38:13 +02:00
Regis Houssin
9bb1431fd9 Fix: change version 2017-07-16 08:06:58 +02:00
Laurent Destailleur
3ac85e10c5 NEW Add mass action "validate" on supplier invoices.
NEW Add date_valid and date_pointoftax on supplier invoices.
2017-07-14 14:40:09 +02:00
Laurent Destailleur
81f1a34112 Revert "Fix SPEC #7013 : use database type "numeric" to store monetary values" 2017-06-16 13:06:35 +02:00
Alexandre SPANGARO
f424f96589 Fix SPEC #7013 : use database type "numeric" to store monetary values 2017-06-16 05:15:00 +02:00