Laurent Destailleur
929893bd49
Fix regression introduced with task comments
2017-12-15 20:07:35 +01:00
Laurent Destailleur
db91a88c59
Fix error message and migration
2017-12-15 19:54:57 +01:00
Laurent Destailleur
ebdbddb7fd
Fix error message and migration
2017-12-15 19:50:39 +01:00
Laurent Destailleur
5af153550d
Debug blockedlog:
...
- Add a track into log when we disable/enable module
- Add a protection to avoid disable of module when recording was started
- Better compatibility with multicompany
- Can filter on ref and amount
- Add a permission to read the blockedlog
- Add more information on payments/invoice/thirdparty into log
- Reset of module data after a migration from v6 (not compatible)
2017-12-15 16:56:08 +01:00
fappels
bb700494a1
Fix Collation update missing for llx_expeditiondet_batch
2017-12-13 20:39:37 +01:00
Laurent Destailleur
1593792cdd
Fix loading data after first install
2017-12-11 14:56:12 +01:00
Laurent Destailleur
066e04f33d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2017-12-11 00:22:05 +01:00
Laurent Destailleur
e01195f4f1
Merge pull request #7935 from aspangaro/7.0-b1
...
FIX : v7 sql error on init database
2017-12-10 20:58:05 +01:00
Laurent Destailleur
d701a7617b
Fix province nadorgg into nador
2017-12-10 19:04:21 +01:00
Alexandre SPANGARO
cc2ea35c9a
FIX : data
2017-12-10 08:46:50 +01:00
Alexandre SPANGARO
918f25983c
FIX : v7 sql data
2017-12-10 08:27:13 +01:00
Alexandre SPANGARO
ff9c714f88
FIX : v7 sql error on init database
2017-12-10 08:02:57 +01:00
Laurent Destailleur
cf5265d405
Minor fix
2017-12-07 21:44:12 +01:00
Laurent Destailleur
dc04ab3164
Missing field in website module
2017-12-02 13:24:21 +01:00
Laurent Destailleur
6796c08cb8
Debug/rewrite Blockedlog
2017-11-30 14:21:55 +01:00
Laurent Destailleur
a9d3e90b70
Big debug of accountancy module
2017-11-27 21:53:22 +01:00
Laurent Destailleur
bb1efb42ce
Update doc
2017-11-25 14:58:16 +01:00
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
463441c808
Fix bad table name
2017-10-12 18:32:10 +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
Laurent Destailleur
1bb5408d83
FIX #7464
2017-09-24 22:18:10 +02:00
Laurent Destailleur
e1b4788bc2
Update vat rates
2017-09-23 01:52:14 +02:00
Laurent Destailleur
63ec14e47d
Convert sode to send member info email into new generic email template
...
system.
2017-09-22 20:18:11 +02:00
Laurent Destailleur
f990667b1a
NEW Can send email from the member card using email templates.
2017-09-22 17:48:38 +02:00
Laurent Destailleur
57358f0ce5
NEW Provide a way to download a file from a public URL for files in ECM
2017-09-21 14:02:42 +02:00
Laurent Destailleur
8dfa87fcf6
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-19 19:30:28 +02:00
Laurent Destailleur
89bfb81cc7
Fix repair
2017-09-19 01:05:13 +02:00
arnaud
e7bb7a3588
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element
2017-09-18 17:28:03 +02:00
arnaud
9795f48046
NEW comment system working with all objects
2017-09-18 17:27:29 +02:00
Laurent Destailleur
c11ff4a18c
FIX #7368
2017-09-18 15:55:25 +02:00
Laurent Destailleur
4c97f5514d
FIX #7366 renaming table with pgsql
2017-09-18 15:25:21 +02:00
Laurent Destailleur
0355b0d9ed
Merge pull request #7414 from aspangaro/7.0-4
...
Accountancy - Finish moving admin to specific menu & some cleaning
2017-09-18 11:16:36 +02:00
Regis Houssin
a03ef95eaa
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/tables/llx_c_payment_term.sql
2017-09-18 09:11:04 +02:00
Laurent Destailleur
d1fd1df345
Add column position on some dictionaries table
2017-09-17 22:52:29 +02:00
Laurent Destailleur
ab5724e7ff
Mutualize code for forms to send emails. Remove thousand line of code.
2017-09-17 17:12:14 +02:00
Alexandre SPANGARO
c2e1e2491d
Accountancy - Finish moving admin to specific menu & some cleaning
2017-09-16 06:53:29 +02:00
Laurent Destailleur
a4086b52ef
NEW Can send email from contract card
2017-09-16 01:34:15 +02:00
Laurent Destailleur
8773a6860f
Fix HTML5 use of <br> is preferred to <br />
2017-09-15 23:49:04 +02:00
Laurent Destailleur
ffb3823655
Allow null in stock alert threshold to be compatible with #7162
2017-09-15 23:38:03 +02:00
Regis Houssin
db17eb80ec
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/class/paymentterm.class.php
2017-09-15 16:45:49 +02:00
Laurent Destailleur
e02c220c08
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-15 11:04:27 +02:00
Laurent Destailleur
cce1549f66
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/commande/card.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/card.php
htdocs/public/members/new.php
2017-09-15 11:02:34 +02:00
Laurent Destailleur
24cd407cd3
FIX Missing upgrade of fields
2017-09-14 16:52:33 +02:00
Laurent Destailleur
5d920be880
FIX Upgrade missing on field
2017-09-14 16:51:41 +02:00
Laurent Destailleur
42399952ea
Update check.php
2017-09-14 14:48:44 +02:00
TuxGasy
4bc8773417
decode db password if need
2017-09-14 13:52:39 +02:00
Regis Houssin
a494e01f00
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-09-14 12:07:19 +02:00
Laurent Destailleur
a4665e17d4
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/societe/class/societe.class.php
htdocs/societe/list.php
2017-09-12 13:26:25 +02:00
Laurent Destailleur
cda8c6e41a
Fix ref must be 50
2017-09-12 11:51:51 +02:00
Laurent Destailleur
f0f6df4c90
Fix tables declaration
2017-09-11 15:23:49 +02:00
Laurent Destailleur
1f56800a50
Merge pull request #7341 from atm-arnaud/NEW_task_discussion
...
New task discussion
2017-09-11 15:20:13 +02:00
Laurent Destailleur
78ffbd1095
Merge pull request #7369 from hregis/develop_bug
...
Fix: remove table prefix
2017-09-11 15:06:01 +02:00
Laurent Destailleur
403f11759c
Merge pull request #7363 from Gitdyr/develop
...
Danish accounts for accounting
2017-09-11 14:50:58 +02:00
Laurent Destailleur
dcc9cb4a16
Some fixes in various payment
2017-09-11 14:29:27 +02:00
Regis Houssin
f8938f308d
Fix: remove table prefix
2017-09-11 08:17:25 +02:00
Regis Houssin
b5de8da3a6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/modFacture.class.php
2017-09-11 08:07:55 +02:00
Laurent Destailleur
974f99ddb2
Increase length of title field
2017-09-11 02:54:21 +02:00
Laurent Destailleur
2ae135baf1
NEW Add view of status of template invoice
2017-09-10 20:47:45 +02:00
Laurent Destailleur
e7abb39ee2
NEW Template invoices are visible on the customer tab
2017-09-10 19:28:20 +02:00
Laurent Destailleur
01664a135d
Removed not used field
2017-09-10 18:01:34 +02:00
Gitdyr
68a8ef6e2d
Fixed.
2017-09-09 22:21:55 +02:00
Gitdyr
8dbf4bfaee
Danish accounting accounts.
2017-09-09 21:19:02 +02:00
Regis Houssin
a8fdf0b5ea
Fix: missing salaries upgrade reload module
2017-09-09 16:49:26 +02:00
Laurent Destailleur
259cca0230
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/admin/mails_templates.php
2017-09-08 13:30:54 +02:00
Laurent Destailleur
b7197530c2
NEW Each user can edit its own email template (menu tools)
2017-09-08 12:48:01 +02:00
arnaud
82440fd399
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_task_discussion
2017-09-07 16:24:34 +02:00
arnaud
8906c95eea
NEW comments system on task
2017-09-07 16:23:51 +02:00
Regis Houssin
66e548427c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/resultat/clientfourn.php
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-07 10:50:35 +02:00
Laurent Destailleur
53a2ef45a5
Fix upgrade
2017-09-06 22:42:01 +02:00
Laurent Destailleur
451adb077f
Fix upgrade
2017-09-06 22:41:29 +02:00
Laurent Destailleur
08eff908bc
Fix missing field in some env
2017-09-06 21:39:33 +02:00
Laurent Destailleur
17310da0f8
Fix missing field in some env
2017-09-06 21:39:10 +02:00
Laurent Destailleur
859d0dfe97
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-09-06 19:24:42 +02:00
Laurent Destailleur
7a6f3d899c
Fix initial data
2017-09-06 19:21:46 +02:00
Laurent Destailleur
33e2179b65
FIX SQL injection
2017-09-06 18:17:57 +02:00
Laurent Destailleur
f29a4c1fb1
Make accountancy pages responsive
2017-09-05 20:42:34 +02:00
Laurent Destailleur
f5ccd943f1
Fix mix of collation
2017-09-05 20:13:33 +02:00
Laurent Destailleur
e5400a4a36
Fix translation of extrafields
2017-09-02 13:01:41 +02:00
Laurent Destailleur
c1e54b7e23
Merge pull request #7315 from aspangaro/7.0-f2
...
NEW Add project on a various payment
2017-09-02 00:45:36 +02:00
Laurent Destailleur
d71359b634
Update data
2017-09-01 17:42:04 +02:00
Laurent Destailleur
4b9f54e571
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_accounting.sql
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
htdocs/install/mysql/tables/llx_holiday_config.sql
2017-09-01 17:34:57 +02:00
Laurent Destailleur
e13792a555
Fix data for account categories
2017-09-01 15:31:35 +02:00
Alexandre SPANGARO
c4d2ca661f
Merge remote-tracking branch 'uptream/develop' into 7.0-f2
...
# Conflicts:
# htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-01 07:24:55 +02:00
Laurent Destailleur
2ab12f54ff
Fix install error due to too large column with index
2017-08-31 22:42:14 +02:00
Laurent Destailleur
31a74d448c
Work on accounting reports.
2017-08-31 22:38:30 +02:00
Laurent Destailleur
8248bc1c64
Uniformize code of accounting report
2017-08-31 15:44:36 +02:00
Laurent Destailleur
6a3d110d3a
Enhance repair for utf8 mix collation
2017-08-31 14:44:32 +02:00
atm-ph
8188abd4cd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-08-31 11:09:02 +02:00
Laurent Destailleur
9146bb336e
Work on merging all payment modes in one page
2017-08-31 03:34:57 +02:00
Regis Houssin
8e8f94df11
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture-rec.class.php
2017-08-30 19:33:23 +02:00
Alexandre SPANGARO
e081653cef
Add fk_projet in table various_payment
2017-08-30 06:38:33 +02:00
Laurent Destailleur
8f01db10a6
Fix setup for india
2017-08-29 13:41:55 +02:00
Laurent Destailleur
560d975063
Code comment
2017-08-29 12:59:13 +02:00
Laurent Destailleur
e9cdf85286
Fxi repeair of collation
2017-08-29 12:58:18 +02:00
Laurent Destailleur
9312005318
NEW Move accountancy features into a dedicated menu
2017-08-29 12:43:47 +02:00
Laurent Destailleur
1523b2ef80
FIX #7222
2017-08-28 14:02:08 +02:00
Laurent Destailleur
b4769d37d6
Increase emailing title length
2017-08-28 00:06:38 +02:00
Laurent Destailleur
3f7eea2e0a
NEW Can set language on extrafields
2017-08-27 12:12:02 +02:00
Laurent Destailleur
c573df4f0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/card.php
2017-08-26 22:33:56 +02:00
Laurent Destailleur
08da8ef09d
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-08-26 21:58:52 +02:00
Laurent Destailleur
4052e15565
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/comm/action/card.php
2017-08-26 21:58:29 +02:00
Laurent Destailleur
a01bb27d7e
FIX install process with DoliWamp
2017-08-26 21:53:29 +02:00
Laurent Destailleur
271d0c86c6
Fix sql install
2017-08-26 21:03:13 +02:00
Laurent Destailleur
c08d0aeda5
Clean duplicate accounting account
2017-08-26 21:01:26 +02:00
Laurent Destailleur
03eb870576
Fix sql syntax error
2017-08-26 20:16:12 +02:00
Laurent Destailleur
49a2f4f0c6
Fix sql
2017-08-26 20:13:01 +02:00
Laurent Destailleur
782b85ba13
Merge pull request #7285 from hregis/6.0_bug
...
Fix: avoid error "A non-numeric value encountered"
2017-08-26 19:31:16 +02:00
Laurent Destailleur
b3f77ed9f7
Merge pull request #7276 from atm-john/new_develop_extrafields_facture_rec
...
NEW extrafield on facture_rec
2017-08-26 19:26:09 +02:00
Laurent Destailleur
54cc1ac800
Merge emailing target selectors.
2017-08-25 21:20:27 +02:00
John
0653a5d177
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_develop_extrafields_facture_rec
2017-08-24 14:35:01 +02:00
Laurent Destailleur
4337001418
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/list.php
2017-08-24 14:26:45 +02:00
Laurent Destailleur
326d3df63f
FIX select of category
...
FIX pb with extrafield list and key '0'
Conflicts:
htdocs/core/class/extrafields.class.php
2017-08-24 13:28:56 +02:00
Laurent Destailleur
7da6f93d7e
FIX select of category
...
FIX pb with extrafield list and key '0'
2017-08-24 13:23:15 +02:00
Regis Houssin
ad39c30c21
Fix: change old email
2017-08-23 21:23:18 +02:00
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
ccb5344d32
Fix links
2017-08-23 18:52:03 +02:00
Laurent Destailleur
9079d2890c
Fix ajout du code devise Franc Pacifique
2017-08-23 18:13:42 +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
John
b18104788e
New extrafield on facture_rec
2017-08-22 15:22:41 +02:00
Laurent Destailleur
927da89c89
Revert bad change
2017-08-22 11:52:34 +02:00
Laurent Destailleur
681623c3ab
Merge branch 'develop' into patch-1
2017-08-22 11:43:25 +02:00
Laurent Destailleur
30c39d246b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-08-22 11:18:56 +02:00
Laurent Destailleur
206d46cbb7
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
scripts/cron/cron_run_jobs.php
2017-08-22 11:18:17 +02:00
Laurent Destailleur
41ce4886fd
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-08-22 11:15:30 +02:00
Laurent Destailleur
1fe23e3fec
Move french text into english
2017-08-22 09:24:26 +02:00
Laurent Destailleur
4f6363bff8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-08-21 00:49:47 +02:00
Laurent Destailleur
b1121f9f61
Better mode to clean not corrctly removed modules.
2017-08-20 19:27:12 +02:00
Laurent Destailleur
188653a85d
Work on website module
2017-08-20 18:50:51 +02:00
Laurent Destailleur
1101a1094f
Fix translation and migration
2017-08-20 16:07:38 +02:00
Laurent Destailleur
4d46b2ae58
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/filefunc.inc.php
2017-08-17 22:21:30 +02:00
Laurent Destailleur
d37d1a033a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/bank/bankentries.php
htdocs/core/lib/admin.lib.php
htdocs/install/mysql/migration/repair.sql
2017-08-11 19:56:17 +02:00
Laurent Destailleur
bfa8630feb
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-08-07 20:07:36 +02:00
Laurent Destailleur
0bf4ac6fb3
Add missing field fk_supplier_proposal
2017-08-07 20:06:26 +02:00
Laurent Destailleur
0960473c9b
More complete repair of unicode field
2017-08-07 15:51:30 +02:00
Laurent Destailleur
c2a89ae58e
Code comment
2017-08-04 22:58:52 +02:00
Laurent Destailleur
1c157c7c3d
Fix pb with mix collation. Add a way to fix this in repair.
2017-08-04 21:23:40 +02:00
Laurent Destailleur
e039f7cc22
Complete repair script
2017-08-04 16:37:24 +02:00
florian HENRY
8fd45383e2
NEW : manageme extrafields with multientity
2017-08-04 09:00:11 +02:00
Laurent Destailleur
fa752348c8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/index.php
htdocs/contact/list.php
htdocs/langs/en_US/errors.lang
2017-08-02 17:56:09 +02:00
Laurent Destailleur
01e1457a09
Fix typo
2017-08-02 13:46:56 +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
Laurent Destailleur
e5a5d537aa
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-26 19:30:45 +02:00
Laurent Destailleur
c6480af217
Enhance the repair script
2017-07-26 18:47:35 +02:00
Laurent Destailleur
7b34859bc8
Fix collation
2017-07-26 16:14:18 +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
5b9ac2a7a9
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/index.php
2017-07-25 21:11:36 +02:00
Laurent Destailleur
c386a02889
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/langs/en_US/stocks.lang
2017-07-25 21:10:08 +02:00
Laurent Destailleur
8b793a261f
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/modules/DolibarrModules.class.php
2017-07-25 21:08:31 +02:00
Laurent Destailleur
b7c4f1f086
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/compta/facture.php
2017-07-25 21:05:15 +02:00
Laurent Destailleur
c5267154b9
Merge branch 'develop' into Bookkeeping-V6
2017-07-25 20:54:37 +02:00
Laurent Destailleur
6c9242b605
Merge pull request #7201 from atm-florian/dev_extrafields_table_uniformisation
...
NEW new columns into extrafields table to get update create information
2017-07-25 20:04:50 +02:00
florian HENRY
d2ecebdddd
new :new column into extrafeild table to get update create information
2017-07-25 11:57:36 +02:00
Laurent Destailleur
1d7674906f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-25 00:23:09 +02:00
Laurent Destailleur
b50236da4c
Fix dir created at install
2017-07-25 00:07:17 +02:00
Laurent Destailleur
67a442cd9a
Uniformize fields
2017-07-24 11:53:57 +02:00
Laurent Destailleur
25b107defb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/contrat/list.php
htdocs/fichinter/list.php
2017-07-23 19:09:00 +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
Laurent Destailleur
854a6ca3d5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-22 16:40:45 +02:00
Laurent Destailleur
5207b84e8b
Fix compatibility with indian IGST/CSGST/SGST
2017-07-22 01:56:38 +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
3716645b8b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-21 15:03:21 +02:00
Laurent Destailleur
d07741ada1
Merge branch 'develop' into patch-rib
2017-07-21 14:58:33 +02:00
Laurent Destailleur
aacef21cb8
Can clone a page
2017-07-21 13:38:13 +02:00
Laurent Destailleur
7760594643
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
htdocs/theme/eldy/style.css.php
htdocs/websites/class/website.class.php
htdocs/websites/index.php
2017-07-20 18:31:58 +02:00
Laurent Destailleur
2f3128410b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-20 16:49:56 +02:00
Laurent Destailleur
84f621fde3
Fix migration on pgsql
2017-07-19 16:31:15 +02:00
Regis Houssin
c8bd11660d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-18 15:23:43 +02:00
Laurent Destailleur
6e77dab832
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-07-18 15:13:15 +02:00
Laurent Destailleur
04678f92da
Merge pull request #7165 from hregis/develop_bug2
...
Fix: add upgrade 6 to 7 in travis
2017-07-18 14:29:32 +02:00
Laurent Destailleur
cfbd47bd78
Fix field null
2017-07-18 14:09:37 +02:00
Maxime Kohlhaas
d35dbdea92
Change column size in sql table creation also
2017-07-18 10:16:59 +02:00
Maxime Kohlhaas
76eac7ce6a
Fix : creating user from member was failing due to column size difference
2017-07-18 10:13:10 +02:00
Laurent Destailleur
0cf38f7197
Fix log file name not set during install
2017-07-17 16:24:45 +02:00
Laurent Destailleur
b7a6c7d049
Fix log file name not set during install
2017-07-17 16:23:24 +02:00
gauthier
ccbeb162cf
FIX : Buying prices must always be in positive valueo
2017-07-17 11:27:57 +02:00
Regis Houssin
9bb1431fd9
Fix: change version
2017-07-16 08:06:58 +02:00
Regis Houssin
200f232164
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-16 07:51:20 +02:00
Laurent Destailleur
75ec7a309c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-15 21:25:14 +02:00
Laurent Destailleur
c6dcccba18
Fix better warning when record will be saved into a waiting account.
2017-07-15 14:55:04 +02:00
Laurent Destailleur
ab6646d16b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/bank/bankentries.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-07-15 03:54:50 +02:00
Laurent Destailleur
cb87b314be
FIX Maxi debug of journalization of bank journal.
2017-07-15 03:41:07 +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
652d715fdc
Better translation
2017-07-13 18:18:56 +02:00
Laurent Destailleur
3db7bd7624
Fix look and feel v6
2017-07-13 17:44:12 +02:00
Laurent Destailleur
be8e15a777
Prepare fix
2017-07-13 16:25:38 +02:00
Laurent Destailleur
43f6eab2ea
FIX #7146
2017-07-13 15:16:17 +02:00
Laurent Destailleur
13cee53384
Update 5.0.0-6.0.0.sql
2017-07-13 14:26:10 +02:00
Laurent Destailleur
10337b4914
Update llx_mailing_cibles.sql
2017-07-13 14:25:42 +02:00
florian HENRY
67664331e3
Merge branch '6.0' of local repository into 6.0_fix_advtargetmailing
2017-07-12 17:49:44 +02:00
florian HENRY
379a5b9e16
fix : SQL migration in capital letters
2017-07-12 12:35:30 +02:00
Regis Houssin
cb6b81d897
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-11 19:10:22 +02:00
florian HENRY
017b654acd
FIX PgSQL
2017-07-11 17:45:16 +02:00
florian HENRY
c85bf18f0e
Fix AdvtargetEmailing
2017-07-11 14:47:37 +02:00
Laurent Destailleur
be09c911ce
Debug module websites
2017-07-10 23:44:46 +02:00
Laurent Destailleur
bb2dc59c56
More complete request to clean
2017-07-10 11:29:09 +02:00
Laurent Destailleur
3c576dcf21
Fix bad name of tables
2017-07-09 20:57:45 +02:00
Laurent Destailleur
10cb7b2524
Fix remove warnings
2017-07-09 20:31:27 +02:00
Laurent Destailleur
b61f7c0179
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-07-08 22:17:29 +02:00
Laurent Destailleur
65ea0fc2b4
FIX value of user id filled to 0 in llx_bank_url when recording an
...
expense report.
2017-07-08 22:16:35 +02:00
Laurent Destailleur
a562e5a919
Maxi debug of accountancy ledger page.
2017-07-08 20:52:53 +02:00
Laurent Destailleur
f40afcf023
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/facture/list.php
htdocs/compta/paiement/class/cpaiement.class.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stats/facture.php
2017-07-08 18:32:34 +02:00
Laurent Destailleur
2ea7f38d38
Fix migration of version that is not a final version
2017-07-08 12:48:17 +02:00
Laurent Destailleur
fbca244212
Fix must go back to next version
2017-07-07 23:19:15 +02:00
Laurent Destailleur
552031799d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-07 19:42:37 +02:00
Laurent Destailleur
b7af0cca63
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/holiday/card.php
2017-07-07 19:39:57 +02:00
Laurent Destailleur
0a7a092080
FIX Missing ref
2017-07-07 19:17:53 +02:00
Laurent Destailleur
4c1b485d47
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/compta/facture/list.php
2017-07-07 19:06:25 +02:00
phf
6ab0ec4b1b
Fix travis and rename 2 fields
2017-07-07 10:22:37 +02:00
phf
49b8689f2d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-07-05 11:02:39 +02:00
phf
b8865c425f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report
2017-07-05 10:48:01 +02:00
phf
1beec51928
New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE
2017-07-05 10:44:52 +02:00
phf
42183877e8
Fix sql syntax
2017-07-04 09:30:53 +02:00
Laurent Destailleur
9e26e6b0a3
Fix bad value for ref of old contracts
2017-07-03 11:42:17 +02:00
Regis Houssin
3f882cb33a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-03 09:24:05 +02:00
Darkjeff
30153f8c2e
add in bookkeeping date lim reglement
...
Date lim reglement for export Sage and Iris
correct avoir when write in bookkeeping
2017-07-03 07:21:15 +02:00
Laurent Destailleur
db1d97c9ac
Fix bad value for ref of old contracts
2017-07-03 02:09:14 +02:00
Laurent Destailleur
d57fe35efc
Add option to fix corrupted database with bad pagecode
2017-07-03 01:36:04 +02:00
Laurent Destailleur
aa1351d483
Fix to be sure database is not created using utf8mb4 (not yet supported)
2017-07-03 01:10:09 +02:00
Laurent Destailleur
efecb32ec9
Fix migration
2017-07-03 00:11:22 +02:00
Laurent Destailleur
b95dea3b50
Fix missing ;
2017-07-02 23:37:52 +02:00
Laurent Destailleur
727085f3ec
Fix missing migration column zip
2017-06-30 19:01:49 +02:00
Regis Houssin
fa247ffd98
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-29 08:51:42 +02:00
Laurent Destailleur
2f9cc1c919
Fix avoid errors with postgresql
2017-06-27 18:35:10 +02:00
Laurent Destailleur
c213624c14
Fix migration into product_lot
2017-06-27 16:42:37 +02:00
Laurent Destailleur
3b7667292b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-06-27 11:59:40 +02:00
Laurent Destailleur
75006f9970
Fix data
2017-06-26 13:30:14 +02:00
Laurent Destailleur
3a6314b1a0
Fix data
2017-06-26 13:29:18 +02:00
Laurent Destailleur
78ebffe4f1
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/install/fileconf.php
2017-06-25 02:31:38 +02:00
Laurent Destailleur
6298436a1b
Clean old lot numbers
2017-06-25 02:26:30 +02:00
Laurent Destailleur
ab9be29356
Fix installers
2017-06-24 21:36:51 +02:00
Laurent Destailleur
fed5999a6c
Update doc
2017-06-24 16:57:42 +02:00
Laurent Destailleur
0fd1308f93
Add force_disable_of_modules_not_found to clean database and removed
...
false warning when modules files were removed with disabling it before
2017-06-22 14:06:48 +02:00
Laurent Destailleur
64eef9f89c
Fix compatibility with pgsql
2017-06-22 11:04:15 +02:00
Regis Houssin
2fffd2fa6f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-20 23:26:21 +02:00
Laurent Destailleur
f1701469e0
NEW data files are now also parsed by phpunit for sql syntax
2017-06-20 13:28:34 +02:00
Laurent Destailleur
095155a58b
Enhance sql quality. Refused double quotes into sql content.
2017-06-20 10:06:17 +02:00
Regis Houssin
909826e24f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-20 06:25:35 +02:00
Laurent Destailleur
74c509eac8
Fix bad var type (must be array)
2017-06-20 02:36:13 +02:00
Laurent Destailleur
d78d5d60c4
Fix pgsql
...
Fix missing vat rate info.
2017-06-20 01:45:44 +02:00
Laurent Destailleur
2695cc416e
Fix comment
2017-06-19 21:06:16 +02:00
Laurent Destailleur
24f7128742
Fix pb with postgresql
2017-06-19 21:04:46 +02:00
Laurent Destailleur
64d8b97afe
Fix sql syntax errors
2017-06-19 20:35:14 +02:00
Laurent Destailleur
099ef585b2
Fix pgsql
2017-06-19 20:07:33 +02:00
Laurent Destailleur
1745d06bb7
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2017-06-19 19:56:16 +02:00
Laurent Destailleur
12d7b92556
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8
2017-06-19 19:52:49 +02:00
Laurent Destailleur
bdeddd3617
Fix pgsql migration
2017-06-19 19:48:19 +02:00
Laurent Destailleur
6fb0fc7b71
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7
2017-06-19 19:42:56 +02:00
Laurent Destailleur
f694939fc7
Fix migration with pgsql
2017-06-19 19:39:37 +02:00
Laurent Destailleur
3c73b426d7
Fix migration. Must make reload only on last version step.
2017-06-19 18:32:18 +02:00
Laurent Destailleur
c8b4ab87cb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-06-19 15:08:10 +02:00
Laurent Destailleur
241ec01adf
FIX #7031 missing change column "state_id" since dolibarr 3.5 !!
2017-06-19 15:07:55 +02:00
Laurent Destailleur
cffb368bbd
Merge pull request #7030 from aspangaro/6.0-fec3
...
Fix : Accountancy - Debug and add information in database
2017-06-19 15:02:30 +02:00
Regis Houssin
c50b180e18
Fix: revert fix
2017-06-19 07:32:14 +02:00
Regis Houssin
544d051fe3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-19 07:06:57 +02:00
Laurent Destailleur
caf48f32c4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-06-19 03:01:01 +02:00
Laurent Destailleur
43f25b49a1
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-06-19 03:00:29 +02:00
Laurent Destailleur
5cd5986211
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-06-19 02:59:49 +02:00
Laurent Destailleur
39419bb411
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2017-06-19 02:59:16 +02:00
Laurent Destailleur
774c624687
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8
2017-06-19 02:58:44 +02:00
Laurent Destailleur
52eeeebac9
Fix bad data in sql dump
2017-06-19 02:57:49 +02:00
Laurent Destailleur
5439390461
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7
2017-06-19 02:57:12 +02:00
Laurent Destailleur
6fc4dacd42
Fix migration opensurvey
2017-06-19 02:55:33 +02:00
Laurent Destailleur
8d84277e8c
Complete repair script
2017-06-19 02:18:04 +02:00
Alexandre SPANGARO
e9b6afd2aa
Add last session coding - Add temporaly ledger
2017-06-18 22:17:32 +02:00
Regis Houssin
dcc152d4a4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-18 06:52:20 +02:00
Laurent Destailleur
0482137620
Fix warning
2017-06-17 18:03:53 +02:00
Regis Houssin
a0299042e4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-17 12:05:33 +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
Laurent Destailleur
549bb2c55f
Merge pull request #7020 from aspangaro/7.0-1
...
Fix SPEC #7013 : use database type "numeric" to store monetary values
2017-06-16 12:59:52 +02:00
Laurent Destailleur
e813fd2dfa
Fix missing key import_key and extraparams
2017-06-16 12:57:30 +02:00
Alexandre SPANGARO
f424f96589
Fix SPEC #7013 : use database type "numeric" to store monetary values
2017-06-16 05:15:00 +02:00
Laurent Destailleur
8b7ca1f280
Fix missing vat_src_code into table of expense report
2017-06-15 21:27:20 +02:00
Laurent Destailleur
097be322a6
Modify code to match new v6 structure.
2017-06-15 19:29:00 +02:00
Laurent Destailleur
71c0be20b9
Change data structure for bookkeeping v6
2017-06-15 10:30:32 +02:00
Regis Houssin
cd095e99c9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-14 12:16:10 +02:00
Laurent Destailleur
b889db997a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/datepicker.php
htdocs/core/get_menudiv.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/search_page.php
htdocs/main.inc.php
htdocs/master.inc.php
htdocs/product/list.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
htdocs/user/card.php
htdocs/user/index.php
2017-06-14 10:48:34 +02:00
Laurent Destailleur
7939daa225
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
htdocs/user/index.php
2017-06-14 10:18:24 +02:00
Regis Houssin
773abff80e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-12 21:24:10 +02:00
Laurent Destailleur
ecf29332f3
Merge pull request #6989 from atm-alexis/NEW_blocklog_develop_refactor
...
NEW Blokedlog stuff
2017-06-12 17:44:27 +02:00
Alexis Algoud
0312d2479d
add block info popin, translation, hidden authority feature
2017-06-12 10:26:24 +02:00
Laurent Destailleur
b80ee49032
Add missing currency for bengladesh
2017-06-11 19:27:21 +02:00
Laurent Destailleur
ca324346e4
Update doc
2017-06-11 19:08:40 +02:00
Regis Houssin
8b0354cfdf
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-06-11 16:43:31 +02:00
Laurent Destailleur
5471170a97
Merge pull request #6969 from atm-alexis/NEW_blocklog_develop_refactor
...
NEW blockedlog hash and authority
2017-06-11 15:54:47 +02:00
Regis Houssin
3445c9d329
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/lib/functions.lib.php
2017-06-11 06:27:49 +02:00
Alexis Algoud
11d2a5538b
fix entity default value and add link to download blockchain
2017-06-11 00:03:01 +02:00
Laurent Destailleur
542a72c684
NEW custom dir is enabled dy default on first install.
...
Fix modulebuilder when custom dir not defined.
2017-06-10 23:50:46 +02:00
Laurent Destailleur
acfaec684d
FIX CVE-2017-7888
2017-06-10 22:31:22 +02:00
Laurent Destailleur
36b18f0300
Save MAIN_VERSION_FIRST_INSTALL that is not erased.
2017-06-10 22:11:12 +02:00
Laurent Destailleur
9c482b9f2a
FIX CVE-2017-7886
2017-06-10 21:37:27 +02:00
Alexis Algoud
63b3010c2e
fix sql
2017-06-10 09:28:07 +02:00
Alexis Algoud
3d5899edf3
final blockedlog init
2017-06-10 09:25:32 +02:00
Regis Houssin
fc08adff0f
Fix: syntax error
2017-06-09 14:44:29 +02:00
Regis Houssin
1056473cdc
Try to fix travis error
2017-06-09 13:45:36 +02:00
Regis Houssin
c95b5a4567
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-09 08:04:08 +02:00
Laurent Destailleur
811b0d9af4
Fix missing thumbs images for products
2017-06-09 00:27:44 +02:00
alexis Algoud
9b3b2e600f
init blockedlog trigger and hash store
2017-06-08 17:52:02 +02:00
Regis Houssin
ade915af5f
New: add dictionnary sharing (multicompany)
2017-06-08 16:36:42 +02:00
Regis Houssin
4b98a1aefd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-08 15:05:45 +02:00
phf
d6d451b54a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-06-08 12:03:59 +02:00
phf
711f9696aa
New multi contacts on actioncomm
2017-06-08 12:02:39 +02:00
Laurent Destailleur
a1144e1f66
Fix missing init of hookmanager
2017-06-08 11:18:41 +02:00
Regis Houssin
1baa620688
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-08 10:33:26 +02:00
Regis Houssin
44dba391c1
New: add dictionnary sharing (multicompany)
2017-06-08 10:24:16 +02:00
Regis Houssin
bb37c2f980
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_transverse
2017-06-06 13:54:33 +02:00
Laurent Destailleur
4bda7fcafc
Merge pull request #6949 from aspangaro/6.0-vat2
...
NEW : VAT payment v6 look and feel
2017-06-06 11:08:50 +02:00
Regis Houssin
7ed0643b52
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse
2017-06-06 10:54:16 +02:00
Laurent Destailleur
c50006c91b
Merge pull request #6936 from aspangaro/6.0-multijournal
...
Accountancy - Activate multijournal on bank_journal
2017-06-06 10:38:05 +02:00
Regis Houssin
79a0b959d1
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse
2017-06-06 10:36:37 +02:00
Regis Houssin
b66da3d148
New: big refactorization of multicompany transverse mode
2017-06-06 10:23:33 +02:00
Laurent Destailleur
22efbabfa6
NEW Add hook doUpgrade2
2017-06-06 01:34:25 +02:00
Alexandre SPANGARO
e547aa8aee
NEW : VAT payment v6 look and feel
2017-06-05 15:41:33 +02:00
Alexandre SPANGARO
806d25ae41
Activate multi-journal on expensereport journal
2017-06-05 06:44:53 +02:00
Alexandre SPANGARO
ef9275d031
Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal
...
# Conflicts:
# htdocs/core/menus/standard/eldy.lib.php
2017-06-03 07:48:50 +02:00
Alexandre SPANGARO
90c1a38486
Accountancy - Activate multijournal on bank_journal
2017-06-03 07:23:14 +02:00
Laurent Destailleur
504ea85334
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-06-03 01:55:27 +02:00
Laurent Destailleur
7f18dfee0d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/build_class_from_table.php
dev/skeletons/skeleton_card.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/projet/card.php
2017-06-03 01:55:05 +02:00
Laurent Destailleur
af01e544d5
Merge branch 'develop' into fix_develop_missing_entity_column
2017-06-03 01:11:49 +02:00
Laurent Destailleur
4e397107e1
Merge pull request #6934 from atm-florian/dev_loancalc
...
NEW : Add calculation function for Loan schedule
2017-06-03 01:10:39 +02:00
atm-ph
70a188c042
Fix missing column entity on llx_accounting_journal after init demo with the bash
2017-06-02 21:45:02 +02:00
florian HENRY
b0f2db7aaa
NEW : Add calculation function for Loan schedule
2017-06-02 17:48:29 +02:00
Laurent Destailleur
447db1b324
Fix orphelins for categories tables
2017-06-02 13:46:30 +02:00
Laurent Destailleur
9b4c929d79
NEW Add phpunit to check the engine is defined into sql create files.
2017-06-01 16:09:09 +02:00
Laurent Destailleur
733d1caac6
Correct usage of parameter 'none' in GETPOST
2017-06-01 12:37:16 +02:00
Laurent Destailleur
07a6bb5664
More files to delete in migration
2017-06-01 12:26:17 +02:00
Laurent Destailleur
c9a09adf79
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/main.lang
2017-05-31 12:50:29 +02:00
Laurent Destailleur
d2813eabbc
FIX #6877
...
Conflicts:
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-05-29 13:41:59 +02:00
Laurent Destailleur
19b8918caf
FIX #6881
2017-05-29 13:40:08 +02:00
Laurent Destailleur
4824942369
FIX #6877
2017-05-29 13:39:07 +02:00
Laurent Destailleur
85e0ded573
FIX #6881
2017-05-29 13:35:51 +02:00
Laurent Destailleur
1da648402d
Merge pull request #6886 from hregis/develop_bug
...
Fix: use encrypt for llx_const data
2017-05-29 10:16:07 +02:00
Laurent Destailleur
d19a8929df
Merge pull request #6875 from atm-ph/fix_develop_ref_column_inventory
...
Fix missing column ref on migration for inventory
2017-05-29 10:11:26 +02:00
Laurent Destailleur
7a1480d362
Look and feel v6
2017-05-26 00:02:41 +02:00
Laurent Destailleur
ca08f814c1
Remove deprecated files
2017-05-25 19:38:42 +02:00
Laurent Destailleur
e5fe629a0e
NEW Extrafields support formulas to be computed using PHP expressions
2017-05-24 22:48:44 +02:00
Regis Houssin
55121c5e05
Fix: use encrypt for llx_const data
2017-05-24 16:35:02 +02:00
Laurent Destailleur
cea98ce5cb
Look and feel v6
2017-05-23 15:30:56 +02:00
Laurent Destailleur
80ce8da7a3
Fix migration errors and responsive design
2017-05-23 15:13:52 +02:00
phf
9bc60b8aa5
Fix missing column ref on migration for inventory
2017-05-22 09:26:10 +02:00
Laurent Destailleur
80cbc28385
NEW Add REST API to push a file.
2017-05-20 15:52:36 +02:00
Laurent Destailleur
e340a53f7c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-20 11:58:50 +02:00
Laurent Destailleur
df05980c3a
Prepare table of notification per object (exemple agenda events)
2017-05-20 10:42:45 +02:00
Alexandre SPANGARO
1da0959a3a
Merge remote-tracking branch 'uptream/develop' into 6.0-grh
2017-05-20 08:03:29 +02:00
Alexandre SPANGARO
4ff9607011
Update table accounting_bookeeping to prepare FEC format and harmonization
2017-05-20 07:56:33 +02:00
Laurent Destailleur
330b9e7038
Merge pull request #6866 from absnc/project_element_shipping
...
NEW Enable shipments in Project overview tab
2017-05-19 17:10:51 +02:00
Laurent Destailleur
aec4cef5de
Clean some code for type of event deprecated since 3.3
2017-05-19 12:58:38 +02:00
absnc
7b784a1dcb
Enable shipments for project overview tab
2017-05-19 17:50:10 +11:00
Laurent Destailleur
0b0dbd9649
Code comment
2017-05-18 17:57:20 +02:00
Laurent Destailleur
56989ae5af
Add missing fields making not possible to enter reference price of
...
products into another currency
2017-05-17 15:10:45 +02:00
Laurent Destailleur
7931c548c7
Better translation
2017-05-16 23:58:42 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
Laurent Destailleur
ce84990414
NEW On invoices generated by template, we save if of source template.
2017-05-16 02:46:19 +02:00
Laurent Destailleur
9b550ae178
Fix migration of accountancy_journal from char to num.
2017-05-14 12:54:26 +02:00
Laurent Destailleur
b5b97816c8
FIX #6803
2017-05-13 14:06:14 +02:00
Laurent Destailleur
6f9e67b1fb
Remove no more used constant
2017-05-13 13:08:25 +02:00
Laurent Destailleur
0d11fce834
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-12 15:45:30 +02:00
Laurent Destailleur
5581e5da72
FIX New vat code not correctly implemented if "1 price per customer".
2017-05-12 13:12:17 +02:00
Laurent Destailleur
30cf3f2bda
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/install/mysql/tables/llx_bank_account.sql
2017-05-11 00:03:06 +02:00
Laurent Destailleur
1c7d9b9d9a
Merge pull request #6804 from aspangaro/6.0-multijournal
...
New : Accountancy - Add a list to select the bank journal in bank card
2017-05-10 22:46:30 +02:00
Laurent Destailleur
52de60c49b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-05-10 18:17:58 +02:00
Laurent Destailleur
002bebd837
Fix missing extraparams make sql syntax error
2017-05-10 18:15:01 +02:00
Laurent Destailleur
fe8d34c73b
Add field extraparams on llx_bank_account
2017-05-10 17:50:10 +02:00
Laurent Destailleur
8781f6bcf2
Add vat code on predefined invoice
2017-05-10 14:53:20 +02:00
Laurent Destailleur
b8b91db007
Use function top_httphead to include headers in pages.
2017-05-09 21:46:57 +02:00
Laurent Destailleur
39b4549813
Make option MAIN_SECURITY_CSRF_WITH_TOKEN more visible
2017-05-09 19:43:50 +02:00
Laurent Dinclaux
2b7dcfa56d
Add missing vat_src_code field to predefined invoices table
2017-05-09 21:07:32 +11:00
Laurent Destailleur
9fe28c9b2c
NEW Can disable all overwrote translations in one click.
2017-05-09 10:08:04 +02:00
Alexandre SPANGARO
dd97bbdc82
Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal
2017-05-07 15:10:30 +02:00
Laurent Destailleur
46ff62fc87
Work on inventory module debug
2017-05-06 22:28:07 +02:00
Alexandre SPANGARO
7c4b47f20d
Update works
2017-05-06 08:33:12 +02:00
Alexandre SPANGARO
68aaef2f66
Add list to select journal in bank
2017-05-06 08:06:01 +02:00
Laurent Destailleur
fc5f4007a1
Debug accountancy module. Page for bank journalization is still KO.
2017-05-05 16:54:05 +02:00
Laurent Destailleur
885a636351
Debug new journal list page
2017-05-05 16:35:05 +02:00
Laurent Destailleur
11b1a2adac
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
2017-05-05 14:49:25 +02:00
Laurent Destailleur
b7f7683e5a
Merge pull request #6774 from aspangaro/6.0-multijournal
...
Finish to move accountancy journals list to page like dictionnary
2017-05-05 14:21:55 +02:00
Laurent Destailleur
91c505c9c9
Update llx_accounting.sql
2017-05-05 14:20:59 +02:00
Laurent Destailleur
0bffac6dc4
Use constant vor status.
2017-05-05 13:43:43 +02:00
Laurent Destailleur
f069ef9844
FIX #6767
2017-05-05 09:16:11 +02:00
Laurent Destailleur
f32d19fb73
FIX #6767 serious critical error no login possible
2017-05-05 09:15:14 +02:00
Laurent Destailleur
8009370f04
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/contact/document.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/mysql/migration/repair.sql
2017-05-04 10:01:11 +02:00
Laurent Destailleur
b8f5e93ab0
Debug inventory data model
2017-05-02 21:40:18 +02:00
Laurent Destailleur
0bc46facd7
Add missing vat_src_code on recurring invoices
2017-05-02 21:24:18 +02:00
Laurent Destailleur
31d99bbfe6
Complete event tracked automatically
2017-05-02 12:17:25 +02:00
Laurent Destailleur
9641a240ea
Complete vat dictionnary
2017-05-02 11:27:35 +02:00
Alexandre SPANGARO
6afd0d642a
Finish to move accountancy journals list to page like dictionnary
2017-05-01 08:16:09 +02:00
Laurent Destailleur
60951cf307
Less data example
2017-04-30 04:09:50 +02:00
Laurent Destailleur
b57bf6460b
Start debug inventory
2017-04-30 02:34:00 +02:00
Laurent Destailleur
50d65e3a9f
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/install/mysql/migration/repair.sql
2017-04-29 17:40:47 +02:00
phf
8219ff84c8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-04-28 14:45:04 +02:00
Laurent Destailleur
0ba6433a61
Work on module website
2017-04-28 13:10:08 +02:00
Laurent Destailleur
cfde27820e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/translation.php
htdocs/comm/card.php
htdocs/core/menus/standard/eldy.lib.php
2017-04-27 17:20:40 +02:00
Laurent Destailleur
e97fae0c43
Fix typo
2017-04-27 12:10:08 +02:00
Laurent Destailleur
1c20bbb287
NEW Add index and constraints keys on supplier proposal detail table
2017-04-26 12:11:33 +02:00
Laurent Destailleur
84e774ff32
Better translation
2017-04-25 12:57:20 +02:00
Laurent Destailleur
a2287fd183
Add example of sql request to fix llx_product_price
2017-04-24 13:46:41 +02:00
Laurent Destailleur
65fec95458
Fix debian package
2017-04-24 04:17:59 +02:00
Laurent Destailleur
e97e202deb
NEW Can import users
2017-04-17 04:22:53 +02:00
Laurent Destailleur
4c056d68d8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/commande/list.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/bills.lang
htdocs/societe/list.php
2017-04-15 17:02:05 +02:00
Laurent Destailleur
ac884ec463
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/install/repair.php
2017-04-15 16:28:08 +02:00
Laurent Destailleur
7fe66581f1
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-04-15 16:24:30 +02:00
Laurent Destailleur
72ff353e9f
Fix repair of product_stock
2017-04-15 16:22:15 +02:00
Laurent Destailleur
086fa4385f
Fix clean of product_batch
2017-04-15 16:17:22 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
Laurent Destailleur
a73d72f243
Add tables for default values
2017-04-14 10:14:23 +02:00
Laurent Destailleur
26a9999fbf
Support of preview for pdf with several pages
2017-04-12 11:38:55 +02:00
Laurent Destailleur
f598bf8bef
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-04-06 21:59:11 +02:00
Laurent Destailleur
dc14268ac6
FIX complete hourly rate when not defined into table of time spent
2017-04-05 15:24:41 +02:00
Laurent Destailleur
9678c2128e
Add field langs into extrafields definition table
2017-04-03 10:29:20 +02:00
Laurent Destailleur
cab944a1a1
Merge pull request #6602 from aspangaro/6.0-multijournal
...
New : [FP17] Accounting multi-journals
2017-03-31 17:45:10 +02:00
Laurent Destailleur
01a74a8d23
Work on 6.0 look and feel
2017-03-31 17:41:20 +02:00
Laurent Destailleur
979bcd3a9b
NEW Can add a background image on login page
2017-03-31 11:40:31 +02:00
Laurent Destailleur
aca1c1944d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_c_action_trigger.sql
2017-03-30 12:02:27 +02:00
Laurent Destailleur
f01815519a
Fix trigger of automatic events
2017-03-30 11:25:28 +02:00
Laurent Destailleur
e416ea275e
Work on 6.0 look and feel
2017-03-28 21:04:38 +02:00
phf
c3e8a5be62
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-03-28 17:20:50 +02:00
Laurent Destailleur
6bf61c677f
FIX #6586 Introduce processing status
2017-03-28 13:20:31 +02:00
Alexandre SPANGARO
fc2b9a858b
New : [FP17] Add multijournals in accountancy admin
2017-03-28 06:35:03 +02:00
Alexandre SPANGARO
aa924bf010
Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal
...
# Conflicts:
# htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-03-27 22:35:06 +02:00
BENKE Charlie
9871bc3d9a
Update 5.0.0-6.0.0.sql
2017-03-26 19:35:00 +02:00
BENKE Charlie
d60f1d8402
add price_level on product_customer_price_log
...
fk_soc can be 0 when generic price is stored on log
2017-03-26 19:29:16 +02:00
atm-ph
76b95aeec0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-03-25 19:15:25 +01:00
atm-ph
e3afa06cf3
Fix inventory sql
2017-03-25 18:01:43 +01:00
Laurent Destailleur
278bbf184c
Merge pull request #6546 from aspangaro/6.0-new_bank_direct_input
...
New : Add Various payment submodule linked to the accountancy to replace free input in bank
2017-03-24 22:52:39 +01:00
Laurent Destailleur
6f3231745e
Merge pull request #6564 from tiaris/devcamp
...
bug 6563 installation issue with
2017-03-24 22:47:50 +01:00
atm-ph
edc2d39702
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-03-24 17:06:40 +01:00
jean
cdb1de7596
bug 6563 installation issue with
...
doctemplates/usergroups/template_usergroups.odt
2017-03-24 16:48:44 +01:00
BENKE Charlie
80f78e66bb
error on install
2017-03-24 15:30:46 +01:00
Laurent Destailleur
f241bfefd0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-23 20:20:59 +01:00
Laurent Destailleur
53a04703d6
Uniformize code
2017-03-23 16:10:38 +01:00
gauthier
6cecab4c92
FIX : forgottent fk_unit field on llx_supplier_propaldet
2017-03-22 16:43:12 +01:00
Laurent Destailleur
db35db127c
Do not allow to migrate n+2 before n+1
2017-03-20 19:21:26 +01:00
Alexandre SPANGARO
6d5578a876
Reactivated constant BANK_DISABLE_DIRECT_INPUT
2017-03-19 20:47:30 +01:00
Laurent Destailleur
4831fb4dcb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
2017-03-19 11:26:49 +01:00
Alexandre SPANGARO
0e910616b6
Update table
2017-03-19 07:25:19 +01:00
Laurent Destailleur
5871d59db9
Fix error "Invalid default value for 'date_price'"
2017-03-18 15:25:49 +01:00
Alexandre SPANGARO
8328c04624
2nd step : Add table
2017-03-18 08:12:29 +01:00
Alexandre SPANGARO
16b12b33fc
First step : remove BANK_DISABLE_DIRECT_INPUT
2017-03-18 07:24:55 +01:00
Laurent Destailleur
d951114c18
Merge branch 'develop' into NEW_odt_others_objects
2017-03-14 10:44:05 +01:00
arnaud
3ab7bac511
FIX fresh install const
2017-03-14 09:37:51 +01:00
arnaud
192a825de8
NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class
2017-03-14 09:25:29 +01:00
Alexandre SPANGARO
c6c07bf9f4
New : Add project to social contributions
2017-03-12 14:32:49 +01:00
arnaud
a796a321cc
Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/product/admin/product.php
htdocs/product/card.php
2017-03-10 12:16:55 +01:00
arnaud
4a7e3fb387
NEW odt usergroup
2017-03-08 11:34:21 +01:00
Laurent Destailleur
5f79b2d0c6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/accountancy/admin/categories.php
htdocs/expensereport/class/expensereport.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-03-05 22:11:35 +01:00
Laurent Destailleur
f67c967d0b
FIX The vat rate line used when adding a predefined product was wrong if
...
there is several vat line with same rate.
2017-03-04 22:27:44 +01:00
Laurent Destailleur
832c91417a
Fix the default_vat_code was not correctly saved and shown on the
...
product price.
2017-03-04 19:16:09 +01:00
Laurent Destailleur
5d18aad15f
Add the vat_code on all table of prices
2017-03-04 14:18:04 +01:00
Laurent Destailleur
bef5f2c236
FIX #6465
2017-03-03 15:06:17 +01:00
Laurent Destailleur
28ad50e059
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/suppliers.lang
2017-03-03 14:31:35 +01:00
Laurent Destailleur
807eb56807
Add BHD currency
2017-03-03 13:15:20 +01:00
Laurent Destailleur
57b532cdd0
Fix status of opportunity is required if an amount is defined
2017-03-02 12:56:22 +01:00
Laurent Destailleur
8487f0fc96
Fix missing setup of new option
2017-03-01 11:18:11 +01:00
Laurent Destailleur
0f22beb774
Upgrade to ckeditor 4.6.2.
2017-02-28 10:49:58 +01:00
Laurent Destailleur
821324868a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-27 12:15:31 +01:00
Laurent Destailleur
1f693ca586
Code comment
2017-02-27 12:07:14 +01:00
Laurent Destailleur
1ef899dacc
Prepare database to follow supplier discounts
2017-02-24 15:22:32 +01:00
Laurent Destailleur
a0fb53d5b1
Merge branch 'develop' into NEW_pdf_supplier_payment
2017-02-22 14:20:47 +01:00
Laurent Destailleur
7ab600781d
NEW Move login information on home page into a widget
2017-02-21 11:57:52 +01:00
