Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
65,163 Commits 36 Branches 189 Tags
40d04482b030e4b697e23fcb51e37b00f7b2d47b
Commit Graph

4130 Commits

Author SHA1 Message Date
Laurent Destailleur
f3c6442a93 Code comment 2017-10-22 14:44:50 +02:00
Laurent Destailleur
6bd0550bdd Remove rowid into script. Must use the autoincrement. 2017-10-22 02:58:31 +02:00
Juanjo Menent
b8c2c1a907 Merge remote-tracking branch 'upstream/develop' into develop 2017-10-21 14:58:52 +02:00
Laurent Destailleur
19a5780f7f Clean code 2017-10-20 23:49:20 +02:00
Juanjo Menent
f18980a209 NEW: Add Chile accounting plan 2017-10-20 19:02:04 +02:00
Juanjo Menent
47b1cf5a91 NEW: Add Chile accounting plan 2017-10-20 11:55:47 +02:00
Juanjo Menent
6137a17fa6 NEW: Add Chile accounting plan 2017-10-20 10:56:58 +02:00
Laurent Destailleur
9c45e86a1c Introduce main_doc into table of objects to know what is main doc. 
Work on option PROPOSAL_USE_ONLINE_SIGN
 2017-10-19 11:40:40 +02:00
Laurent Destailleur
1b563dbf76 Rename table 2017-10-19 09:29:34 +02:00
Laurent Destailleur
30dad0be12 Split file of chart of account to prepare to load files after install 2017-10-19 09:28:59 +02:00
florian HENRY
4273e507c5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 
dev_accountancy

Conflicts:
	htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
	htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
	htdocs/accountancy/class/lettering.class.php
 2017-10-18 09:52:56 +02:00
atm-ph
bab43b043e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact 2017-10-13 09:52:56 +02:00
Laurent Destailleur
1fba58b9ce Fix bookmark list 2017-10-12 17:09:17 +02:00
Laurent Destailleur
37272b264c Fix sql 2017-10-11 19:45:18 +02:00
Laurent Destailleur
56be9e2b60 Introduce table c_email_senderprofile to have several profils 2017-10-11 19:41:45 +02:00
Laurent Destailleur
bcf56e3140 Introduce table c_email_senderprofile to have several profils 2017-10-11 19:41:19 +02:00
Laurent Destailleur
cd814d420b Fix repair utf8 mix collation 2017-10-11 16:54:17 +02:00
Laurent Destailleur
f93ecc1584 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
	htdocs/projet/activity/perweek.php
	htdocs/projet/element.php
 2017-10-10 11:24:17 +02:00
Laurent Destailleur
4de1ade605 Fix mix collation 2017-10-09 18:15:10 +02:00
Laurent Destailleur
15911a9b64 Fix illegal mix collation 2017-10-09 17:45:08 +02:00
Laurent Destailleur
19de053054 Fix itf8 mix collation 2017-10-09 17:43:57 +02:00
Laurent Destailleur
ce7ce82801 Enhance email template editor 2017-10-08 14:51:10 +02:00
Laurent Destailleur
8e187c2759 Debug module website 2017-10-06 22:49:08 +02:00
Laurent Destailleur
43d85af5ae Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-06 15:23:10 +02:00
Laurent Destailleur
afc1938676 FIX #7550 2017-10-06 14:28:01 +02:00
Laurent Destailleur
06b18a740e NEW Add date of birth on user card. 
NEW Show expected worked hours on the timesheet form.
 2017-10-06 12:08:01 +02:00
Laurent Destailleur
04a56d4bd9 Fix phpunit 2017-10-05 09:34:09 +02:00
Laurent Destailleur
75a7e086b3 Merge pull request #7427 from atm-arnaud/NEW_comment_generic_element 
New comment generic element
 2017-10-04 11:13:39 +02:00
Laurent Destailleur
f2e0ff0d30 Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict 2017-10-03 17:25:01 +02:00
Laurent Destailleur
1f11dcb4bd Fix no loose of configuration of action auto after upgrade Close #7527 2017-10-03 17:21:18 +02:00
Laurent Destailleur
fef6440ff2 FIX #7541 2017-10-03 16:23:30 +02:00
Laurent Destailleur
0f194d6715 Update llx_holiday.sql 2017-10-03 16:21:44 +02:00
Frédéric FRANCE
dd76672c27 ref can be null 2017-10-03 00:30:42 +02:00
Laurent Destailleur
97d399595f Add unique key on table to follow leave request counter per type 2017-10-02 17:45:01 +02:00
Regis Houssin
09e71f1390 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-10-02 11:51:27 +02:00
Laurent Destailleur
94ae6c62e6 Add htmlheader field for each page 2017-10-02 00:08:00 +02:00
Laurent Destailleur
9654c4f168 New extrafields are visible into list by default 2017-09-29 13:29:48 +02:00
Laurent Destailleur
f007f9e7e5 NEW Add new property visible dy default on lists on extrafields 2017-09-29 13:26:44 +02:00
Laurent Destailleur
8242469e40 FIX The unique index on email templates can work now. 2017-09-27 18:16:28 +02:00
Laurent Destailleur
f1f4a2fb44 Add email template to send SEPA mandate 2017-09-27 17:40:14 +02:00
Regis Houssin
20684b4505 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/core/modules/rapport/pdf_paiement.class.php
	htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
 2017-09-27 17:22:18 +02:00
arnaud
f29ea35dc8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element 2017-09-27 14:56:52 +02:00
Laurent Destailleur
f1a563625b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
 2017-09-26 22:11:00 +02:00
Laurent Destailleur
15c8515d53 Fix default 2017-09-26 19:08:04 +02:00
Laurent Destailleur
7f420f3246 Complete vat rates for india 2017-09-26 10:54:07 +02:00
Laurent Destailleur
4f76545b62 Add missing fields to manage localtax on supplier products 2017-09-26 10:47:08 +02:00
Laurent Destailleur
c9e9f60f8f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-09-25 19:55:52 +02:00
Laurent Destailleur
c5287e68b1 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/admin/multicurrency.php
	htdocs/core/modules/modFournisseur.class.php
 2017-09-25 19:54:27 +02:00
Laurent Destailleur
58bc30ae9a Add indian vat 2017-09-25 19:08:17 +02:00
Regis Houssin
d592664150 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-09-25 06:48:26 +02:00