Commit Graph

4066 Commits

Author SHA1 Message Date
Laurent Destailleur
6a8388dd57 Add table for online signature 2017-11-25 14:11:34 +01:00
Laurent Destailleur
aaf08ade2f Fix bug reported by scrutinizer 2017-11-25 11:21:31 +01:00
Laurent Destailleur
d90f68837a Missing migration line 2017-11-25 00:59:25 +01:00
Laurent Destailleur
0ec8c3c296
Merge branch 'develop' into patch-34 2017-11-25 00:57:10 +01:00
Laurent Destailleur
6876049779
Update 4.0.0-5.0.0.sql 2017-11-25 00:56:24 +01:00
Laurent Destailleur
e22d13cf55
Merge pull request #7860 from IonAgorria/resources-country
Add country to resource
2017-11-24 16:35:52 +01:00
Laurent Destailleur
831099fef8 Debug modulebuilder 2017-11-24 16:24:42 +01:00
Laurent Destailleur
9f235e1ff6 Standardize database: field ref of warehouse was renamed label -> ref 2017-11-24 15:27:00 +01:00
Laurent Destailleur
6a3dc91414 Standardize code 2017-11-23 15:22:32 +01:00
Laurent Destailleur
295b4483d4 Enhance the repair.php tool 2017-11-23 13:23:16 +01:00
Laurent Destailleur
5b77fe393e Fix: contact not preselected 2017-11-23 00:59:43 +01:00
Ion
6428c2157c Add country to resource 2017-11-23 00:26:25 +01:00
atm-ph
15a8f2037b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact 2017-11-18 11:54:21 +01:00
Laurent Destailleur
cf0d67d71c Generation of pdf become default value 2017-11-17 23:57:32 +01:00
Laurent Destailleur
d326641072
Merge pull request #7813 from hregis/develop_ldap
Fix: missing encrypt datafor llx_const
2017-11-17 13:03:22 +01:00
Laurent Destailleur
f708450276 Fix sql error 2017-11-16 22:57:25 +01:00
Laurent Destailleur
e6d02cebe7 Complete templates 2017-11-16 12:09:17 +01:00
Laurent Destailleur
612dfb91ff Add more img templates for medias dir 2017-11-15 21:01:05 +01:00
Laurent Destailleur
d4d26eac9b More templates into medias directory 2017-11-15 20:41:04 +01:00
Laurent Destailleur
c85acbfc11 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/install/repair.php
2017-11-14 19:47:33 +01:00
Laurent Destailleur
366ade4030 Code comment 2017-11-14 19:42:34 +01:00
Laurent Destailleur
77b6ef7396 Code comment 2017-11-14 19:41:57 +01:00
Laurent Destailleur
388b90a94c Fix repair of utf8 2017-11-14 19:00:52 +01:00
Regis Houssin
a4b96f00df Fix: missing encrypt datafor llx_const 2017-11-14 16:00:34 +01:00
Laurent Destailleur
2d78136781 Standardize field length 2017-11-13 18:04:14 +01:00
Laurent Destailleur
53bfbcf5db NEW Ad performances indexes on calendar events 2017-11-13 17:05:07 +01:00
Laurent Destailleur
b5196b7164 FIX A lot of several fix on local taxes and NPR tax 2017-11-13 14:24:40 +01:00
Laurent Destailleur
cba3a3846f
Merge pull request #7790 from frederic34/facrecmodelpdf
NEW generate also document when invoice is build from recurring template
2017-11-11 17:42:26 +01:00
Frédéric FRANCE
6f647f8a40
generate doc on cron jobs 2017-11-09 23:39:28 +01:00
Laurent Destailleur
f6a0603fb0 Clean code/constant 2017-11-09 18:16:15 +01:00
Laurent Destailleur
fa999dfa65
Merge pull request #7742 from aspangaro/7.0-accountancyproductvariant
NEW Accountancy Add variant on sell account for intracommunity sales & export sales
2017-11-06 09:25:14 +01:00
Laurent Destailleur
d0e354f729
Merge pull request #7766 from aspangaro/7.0-6
FIX Missing fields for the table bookeeping_tmp on migration
2017-11-05 18:38:01 +01:00
Laurent Destailleur
86eb028beb Repair datec empty for products 2017-11-04 15:25:52 +01:00
Alexandre SPANGARO
26cb4bc6f6 FIX Missing fields for the table bookeeping_tmp on migration 2017-11-04 08:10:05 +01:00
Alexandre SPANGARO
7e3103356b Merge remote-tracking branch 'uptream/develop' into 7.0-accountancyproductvariant
# Conflicts:
#	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-11-04 07:14:28 +01:00
Laurent Destailleur
4ac8cb9168 Fix sql syntax 2017-11-03 16:31:33 +01:00
Laurent Destailleur
a346a1a5e9 Work on website module 2017-11-03 15:56:16 +01:00
Laurent Destailleur
55386a3ae2 Work on website module 2017-11-03 13:52:03 +01:00
Laurent Destailleur
fa1fbe7db7 Work on websiteaccounts 2017-11-03 13:25:49 +01:00
Alexandre SPANGARO
2d17e4094c Merge remote-tracking branch 'uptream/develop' into 7.0-accountancyproductvariant
# Conflicts:
#	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-11-03 06:18:27 +01:00
Laurent Destailleur
d137cef843
Merge pull request #7707 from aspangaro/7.0-SPEC1
SPEC #7013 : use database type "double" to store monetary values
2017-11-02 09:54:34 +01:00
Laurent Destailleur
9458c80c48 Work on reminders 2017-10-31 23:10:29 +01:00
Alexandre SPANGARO
cc26095467 Update database 2017-10-31 22:04:50 +01:00
Alexandre SPANGARO
a0d186bae6 Merge remote-tracking branch 'uptream/develop' into 7.0-SPEC1 2017-10-31 05:53:05 +01:00
Laurent Destailleur
d569218162 Fix 'separate' extrafields must be visible by default.
Sandardize name of list pages (must end with _list.php)
2017-10-29 11:23:20 +01:00
Alexandre SPANGARO
e7832e3c44 Correct PR 2017-10-29 07:16:04 +01:00
Alexandre SPANGARO
63707dbe10 Merge remote-tracking branch 'uptream/develop' into 7.0-SPEC1 2017-10-29 06:58:04 +01:00
Alexandre SPANGARO
16e4e8ada1 Fix SPEC1 2017-10-29 06:56:05 +01:00
Laurent Destailleur
00b505a71c Fix sql syntax 2017-10-27 01:48:05 +02:00
Laurent Destailleur
5ba64fe620 Merge branch 'develop' into 7.0-pcg6 2017-10-27 01:42:03 +02:00
Laurent Destailleur
ba9ed52bc0 Fix sql norm (string must be ') 2017-10-27 01:40:41 +02:00
Laurent Destailleur
54746a55b5 Merge pull request #7705 from aspangaro/7.0-pcg5
NEW Add The SYSCOHADA chart of accounts
2017-10-27 01:17:47 +02:00
Laurent Destailleur
315fce701b Fix migration pgsql 2017-10-26 18:46:44 +02:00
Laurent Destailleur
653f5fcbbf Remove warning 2017-10-26 18:40:12 +02:00
Laurent Destailleur
d1e7577eed Fix sql field can't be named 'offset' (reserved word). 2017-10-26 18:30:01 +02:00
Laurent Destailleur
8058712d47 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/contrat/class/contrat.class.php
	htdocs/product/list.php
2017-10-26 17:06:11 +02:00
Laurent Destailleur
ffee915498 Fix field not serial with pgsql 2017-10-26 15:10:52 +02:00
Laurent Destailleur
5f5cbec1cf Debug module website 2017-10-26 13:09:11 +02:00
Laurent Destailleur
e36cd21d5d Fix sql 2017-10-26 03:20:43 +02:00
Laurent Destailleur
66d2c29fe1 Work on modulebuilder and website module 2017-10-26 01:02:13 +02:00
Laurent Destailleur
bb996019c2 NEW Support visibility on extrafields 2017-10-25 11:42:14 +02:00
Alexandre SPANGARO
ecbc393c96 FIX SPEC #7013 : use database type "numeric" to store monetary values 2017-10-24 21:14:31 +02:00
Alexandre SPANGARO
735f296b7f Update pcg_type 2017-10-24 19:31:24 +02:00
Alexandre SPANGARO
22d2598ea1 NEW Add The Moroccan chart of accounts 2017-10-24 19:23:09 +02:00
Alexandre SPANGARO
17e8b6c84c NEW Add The SYSCOHADA chart of accounts 2017-10-24 19:12:42 +02:00
Laurent Destailleur
72441de1ec Fix length of fk_mainmenu and fk_leftmenu 2017-10-24 17:35:53 +02:00
Laurent Destailleur
d2f723045c Work on website and modulebuilder 2017-10-24 17:30:05 +02:00
Laurent Destailleur
e58a52c52b Merge branch 'develop' into 7.0-pcg4 2017-10-24 12:59:59 +02:00
Laurent Destailleur
deeebac540 Merge branch 'develop' into 7.0-pcg3 2017-10-24 12:58:09 +02:00
Laurent Destailleur
110f2fc5da Merge pull request #7695 from aspangaro/7.0-pcg2
NEW Add The Switzerland chart of accounts
2017-10-24 12:54:48 +02:00
Laurent Destailleur
e2060e7541 Merge pull request #7694 from aspangaro/7.0-pcg1
NEW Add The developed French chart of accounts 2014
2017-10-24 12:52:22 +02:00
Laurent Destailleur
e257da6b19 Reload of menu auguria done when required 2017-10-24 09:47:18 +02:00
Alexandre SPANGARO
eb6ba2ba55 NEW Add The Tunisia chart of accounts 2017-10-24 07:19:07 +02:00
Alexandre SPANGARO
9e673f7c87 NEW Add The Luxembourg chart of accounts 2017-10-24 07:07:28 +02:00
Alexandre SPANGARO
d43c186777 NEW : Add The accountancy Switzerland chart of accounts 2017-10-24 06:40:54 +02:00
Alexandre SPANGARO
8ba2fb8d4a New : Add The developed accountancy french plan 2014 2017-10-24 06:05:19 +02:00
Laurent Destailleur
9df3f5c75e Migration of data 2017-10-23 19:18:17 +02:00
Laurent Destailleur
f083ac5e6b Prepare database to store country int accounting_system table 2017-10-23 18:56:09 +02:00
Laurent Destailleur
97b694b59c Fix missing field in migration v6 2017-10-23 10:22:45 +02:00
Laurent Destailleur
109d9cab85 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-23 10:21:56 +02:00
Laurent Destailleur
f675be650e Fix missing field in migration v6 2017-10-23 10:21:45 +02:00
Laurent Destailleur
ead08c17d8 Discard loading of chart of account 2017-10-22 23:52:50 +02:00
Laurent Destailleur
812687e10c FIX Restore feature to enable a module during CLI upgrade 2017-10-22 16:08:52 +02:00
Laurent Destailleur
1fe1cb986a Fix AUTO_INCREMENT PRIMARY KEY does not need NOT NULL 2017-10-22 15:51:07 +02:00
Laurent Destailleur
efb369f857 Merge pull request #7497 from atm-florian/dev_accountancy
NEW : lettrage in accountancy
2017-10-22 15:28:53 +02:00
Laurent Destailleur
611f5f638d FIX #7616 2017-10-22 15:07:41 +02:00
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