lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

933 Commits

Author SHA1 Message Date
dtix
e6da000ae8
Romania vat rate changed 2018-06-06 14:48:11 +03:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00
Laurent Destailleur
ba6193cff7 Add indonesia provinces 2018-05-25 14:57:30 +02:00
dtix
cca1d26943
Romanian chart of account added 2018-05-22 11:23:59 +03:00
dtix
63e056064e
Create llx_accounting_account_ro.sql 2018-05-22 11:22:04 +03:00
Abbes Bahfir
de8bd3f886 New : Translate accountancy journal menu entries 2018-05-07 08:43:41 +01:00
Alexandre SPANGARO
130f270627 Fix : Migration 7.0.0 don't contains all new chart of accounts. 2018-04-10 21:16:36 +02:00
Alexandre SPANGARO
a5428cc8c7 NEW Module Assets 2018-04-01 21:26:52 +02:00
Laurent Destailleur
6e32e9961f Syn transifex 2018-03-23 17:56:35 +01:00
Laurent Destailleur
7363ae17ee Move setup of email for module module into email templates 2018-03-23 16:09:46 +01:00
Laurent Destailleur
517301f014 Work on subscription reminder 2018-03-21 16:40:09 +01:00
Laurent Destailleur
39228f6221 South africa vat rates 2018-03-18 23:37:46 +01:00
Laurent Destailleur
8223047d4a South africa vat rates 2018-03-18 23:37:28 +01:00
Laurent Destailleur
c4ca4a5a16 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/tva/index.php
	htdocs/install/mysql/data/llx_accounting_category.sql
 2018-03-15 15:11:18 +01:00
Laurent Destailleur
85e307d6b8 Fix report when group is not dedicated to a country 2018-03-15 12:31:24 +01:00
Laurent Destailleur
db18db9488 Clean code 2018-03-15 11:27:39 +01:00
Laurent Destailleur
8048259733 Work on ticket module integration 2018-03-13 12:13:47 +01:00
jfefe
79acb79ae0 Begin integration of module « Ticketsup » 
Related to #4948
 2018-03-11 09:44:58 +01:00
Laurent Destailleur
fe45e82e99 Fix use of table llx_c_paiement (param showempty was not used/set) 2018-03-07 19:00:38 +01:00
Laurent Destailleur
78cbd92e98 Fix init data on table of payment mode 2018-03-07 18:30:39 +01:00
Laurent Destailleur
1ca5c7083a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2018-03-07 11:54:48 +01:00
Laurent Destailleur
72af963ed5 Fix triggers 2018-03-06 12:26:26 +01:00
Laurent Destailleur
1ee128ff13 NEW Add type of website container/page into dictionary 2018-02-19 19:48:53 +01:00
Laurent Destailleur
f251113f69 Fix accounting module with multicompany 2018-02-06 01:00:35 +01:00
Laurent Destailleur
710cefa3a8 Add missing vat rates 2018-01-21 21:30:11 +01:00
Laurent Destailleur
a3a24e2182 Clean chart of account files 2018-01-20 17:52:01 +01:00
Laurent Destailleur
dcd579242f Fix <br /> (xml) into <br> (html) 2018-01-17 13:26:57 +01:00
Laurent Destailleur
968bb8a100 Fix travis 2018-01-08 02:15:20 +01:00
Laurent Destailleur
140ee422a4 NEW Add chart of account for england 2018-01-05 22:06:40 +01:00
Laurent Destailleur
a37019a25b NEW Add chart of account for england 2018-01-05 22:04:43 +01:00
Laurent Destailleur
c3f8012dfb Update vat rates 2018-01-02 23:05:40 +01:00
Laurent Destailleur
98b82d712a NEW Revenue stamp can be a percent 
FIX Revenue stamp not visible on the transfer payment page
 2017-12-18 12:43:03 +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
Laurent Destailleur
0ec8c3c296
Merge branch 'develop' into patch-34 2017-11-25 00:57:10 +01:00
Laurent Destailleur
f6a0603fb0 Clean code/constant 2017-11-09 18:16:15 +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
e36cd21d5d Fix sql 2017-10-26 03:20:43 +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
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
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
6bd0550bdd Remove rowid into script. Must use the autoincrement. 2017-10-22 02:58:31 +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
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
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
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
7f420f3246 Complete vat rates for india 2017-09-26 10:54:07 +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
58bc30ae9a Add indian vat 2017-09-25 19:08:17 +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
ab5724e7ff Mutualize code for forms to send emails. Remove thousand line of code. 2017-09-17 17:12:14 +02:00
Laurent Destailleur
a4086b52ef NEW Can send email from contract card 2017-09-16 01:34:15 +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
Laurent Destailleur
7a6f3d899c Fix initial data 2017-09-06 19:21:46 +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
Laurent Destailleur
31a74d448c Work on accounting reports. 2017-08-31 22:38:30 +02:00
Laurent Destailleur
8f01db10a6 Fix setup for india 2017-08-29 13:41:55 +02:00
Laurent Destailleur
1523b2ef80 FIX #7222 2017-08-28 14:02:08 +02:00
Laurent Destailleur
271d0c86c6 Fix sql install 2017-08-26 21:03:13 +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
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
1fe23e3fec Move french text into english 2017-08-22 09:24:26 +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
c2a89ae58e Code comment 2017-08-04 22:58:52 +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
5207b84e8b Fix compatibility with indian IGST/CSGST/SGST 2017-07-22 01:56:38 +02:00
phf
6ab0ec4b1b Fix travis and rename 2 fields 2017-07-07 10:22:37 +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
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
64d8b97afe Fix sql syntax errors 2017-06-19 20:35:14 +02:00
Laurent Destailleur
b80ee49032 Add missing currency for bengladesh 2017-06-11 19:27:21 +02:00
Alexandre SPANGARO
806d25ae41 Activate multi-journal on expensereport journal 2017-06-05 06:44:53 +02:00
Laurent Destailleur
aec4cef5de Clean some code for type of event deprecated since 3.3 2017-05-19 12:58:38 +02:00
Laurent Destailleur
7931c548c7 Better translation 2017-05-16 23:58:42 +02:00
Laurent Destailleur
39b4549813 Make option MAIN_SECURITY_CSRF_WITH_TOKEN more visible 2017-05-09 19:43:50 +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
b8f5e93ab0 Debug inventory data model 2017-05-02 21:40: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
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
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
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
arnaud
3ab7bac511 FIX fresh install const 2017-03-14 09:37:51 +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
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
8d03f86f45 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-17 13:10:46 +01:00
Laurent Destailleur
beaa56306c Add united arab emirates to states. 2017-02-17 10:06:49 +01:00
Alexandre SPANGARO
c06aedc54d [FP17] : Add data in llx_accountancy_journal 2017-02-15 20:55:52 +01:00
Andreas Pachler
c45b40075d fixed typos 2017-02-08 12:55:03 +01:00
Andreas Pachler
ae3ace7e94 added additional payment terms often needed in Austria 2017-02-08 12:46:42 +01:00
Laurent Destailleur
b5c815367c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6 2016-12-26 15:44:31 +01:00
Laurent Destailleur
b9e362833f More complete label 2016-12-26 13:15:14 +01:00
Laurent Destailleur
ba7ca3da6e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop6

Conflicts:
	htdocs/core/photos_resize.php
	htdocs/install/mysql/data/llx_c_action_trigger.sql
 2016-12-22 17:57:42 +01:00
Laurent Destailleur
3c79f3acb5 Minor fixes or code comment 2016-12-20 12:06:26 +01:00
Laurent Destailleur
08449a2d4f Prepare action tracking on products 2016-12-20 12:05:00 +01:00
Laurent Destailleur
c750ba8b99 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/install/mysql/data/llx_c_payment_term.sql
	htdocs/langs/en_US/bills.lang
	htdocs/langs/en_US/mails.lang
 2016-12-16 13:56:55 +01:00
Laurent Destailleur
d32fd7aa11 FIX javascript xss injection and a translation 2016-12-15 11:55:33 +01:00
Laurent Destailleur
9ff38ee136 Add missing currency for madagascar 2016-11-29 12:28:17 +01:00
Laurent Destailleur
39c2088aa5 Fix constant 2016-11-29 11:23:15 +01:00
Laurent Destailleur
f1421a2ee4 Rename constant with english name 2016-10-24 13:10:35 +02:00
BENKE Charlie
3c9663d3e8 Introduce SHIPPING on propal (like order) 2016-10-21 23:04:07 +02:00
Laurent Destailleur
304a44ffc2 Debug accounting module 2016-10-21 14:48:55 +02:00
Laurent Destailleur
850a275b47 Fix duplicate accounting account with same number. Add unique key. 2016-10-14 18:46:30 +02:00
Laurent Destailleur
44f9c65f6a Fix missing countries 2016-10-10 17:00:11 +02:00
gauthier
b35a4eb1b2 Merge branch 'NEW_cdr_current_or_next_month' of github.com:atm-gauthier/dolibarr into develop_NEW_cdr_current_or_next_month 2016-10-04 16:01:26 +02:00
gauthier
1c98979ca1 NEW : option "Current/Next" for limit payment date (in payment terms) to use a specific day of current month or jump to same day of next month 2016-10-04 15:45:23 +02:00
Juanjo Menent
28efc3e50f NEW Add Panama datas 2016-08-03 09:45:12 +02:00
Laurent Destailleur
2a28d77eeb FIX #5465 - Fix type account_parent 2016-07-27 19:53:16 +02:00
Laurent Destailleur
7e37cbb9e3 Fix resource module can't work because mandatory data not available. 2016-07-27 19:16:21 +02:00
Laurent Destailleur
058c431483 FIX The project was lost when creating the event "sent by email". Also, 
event company "create" was not tracked by default like others.
 2016-07-21 13:49:10 +02:00
Laurent Destailleur
fd7c494cb6 Add VAT for cyprus 2016-07-18 13:20:04 +02:00
florian HENRY
215f397f33 Cannot reproduce 4793 still fix other bug on PgSQL 2016-06-30 17:28:13 +02:00
Laurent Destailleur
8e8b14af78 Merge pull request #5347 from olsesacl/develop-fix-install 
Fix: install with mysql 5.7.9
 2016-06-16 20:11:56 +02:00
Drosis Nikos
5a51850d54 Greece VAT 23 -> 24 2016-06-16 14:03:11 +03:00
Drosis Nikos
2ef3d7cedb New TVA for Greece 24% 2016-06-16 13:50:35 +03:00
Sergio Sanchis Climent
d9d247e49d Fix install mysql 5.7.9 2016-06-14 00:37:13 +02:00
Laurent Destailleur
681249de8a Debug module resource 2016-06-06 12:29:15 +02:00
Your Name
c581b05c26 Fix: Update Peru regions and departaments 2016-05-23 18:38:55 +02:00
Laurent Destailleur
ed3e15b39e Merge pull request #5150 from fmarcet/peru 
New: Add Perú regions
 2016-05-05 22:48:02 +02:00
fmarcet
bc43c87f51 New: Add Perú regions 2016-05-02 11:36:29 +02:00
aspangaro
7041a041ce FIX: Accountancy - Chart of accounts are limited on only one country 2016-04-30 06:52:21 +02:00
aspangaro
04fd5a20ef FIX: Accountancy Work on categories for Report - Add french example 2016-04-23 15:43:28 +02:00
Laurent Destailleur
27217ccccd Maxi debug of supplier order workflow. 
Add trigger ORDER_SUPPLIER_CLASSIFY_BILLED
Parameter user is added so it is defined into triggers.
 2016-04-09 18:51:09 +02:00
Laurent Destailleur
f14b03a230 NEW Add more trackable events (create, submit and receive supplier 
order). So we will be able to use generic features to log what was done
with the specific table llx_commande_fournisseur_log
 2016-04-08 17:07:25 +02:00
AbdelHakim ALLAL
ed0fd32d15 Update llx_20_c_departements.sql 
Correcting ALGERIA Provinces numbers
*Missing AL10
*Correcting the rest
 2016-03-29 15:23:48 +01:00
Laurent Destailleur
7dac7c4f04 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-11 11:00:53 +01:00
Laurent Destailleur
7a5353efb2 Make things clearer about option MAIN_ENABLE_LOG_TO_HTML 2016-03-10 18:36:09 +01:00
Laurent Destailleur
bc2043cb79 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-03 20:48:47 +01:00
Laurent Destailleur
7dc5fd334f Italian vat to 22 2016-03-03 19:21:17 +01:00
Laurent Destailleur
3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
 2016-03-02 23:40:11 +01:00
Laurent Destailleur
d39dca21d7 Add franc guinéen in currency 2016-03-01 22:48:35 +01:00
Laurent Destailleur
a26f880843 Fix missing declarion of form 
Fix by adding MAIN_USE_OLD_SEARCH_FORM to restore a way for backward
compatibility
Fix to have delay for payment term at least 1 day (to avoid immediate
warning after creation of an invoice)
 2016-03-01 00:59:42 +01:00
Juanjo Menent
77173344fe NEW : Add Malta VAT into 3.9 2016-02-27 09:36:09 +01:00
BENKE Charlie
f0736a30a6 Added Malta VAT 
Hope use it Soon ;-)
 2016-02-25 14:53:06 +01:00
Laurent Destailleur
371dec8503 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
	htdocs/langs/en_US/products.lang
	htdocs/langs/fr_FR/companies.lang
 2016-02-24 12:13:12 +01:00
Juanjo Menent
6db0f01fa4 FIX : Bad Argentina provences 2016-02-22 19:53:39 +01:00
Laurent Destailleur
4754ba5683 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/install/mysql/data/llx_10_c_regions.sql
	htdocs/install/mysql/data/llx_20_c_departements.sql
	htdocs/install/mysql/data/llx_c_forme_juridique.sql
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/companies.lang
	htdocs/langs/fr_FR/compta.lang
 2016-02-19 20:17:51 +01:00
Laurent Destailleur
994715f8bb Upgrade romania 2016-02-19 15:47:00 +01:00
frederic34
e079021de3 data 2016-02-06 12:16:12 +01:00
Laurent Destailleur
04043cdb31 Merge pull request #4569 from abcnet-lu/raisons-socials-luxembourg 
Fix: legal forms and professional IDs in Luxembourg
 2016-02-05 10:58:03 +01:00
Laurent Destailleur
807e7b8304 Merge pull request #4560 from abcnet-lu/revert-develop-20160203 
Fix : Add districts and cantons for Luxembourg
 2016-02-05 10:53:51 +01:00
abcnet-lu
490f3eaf82 [#4566] Add legal forms for Luxembourg 2016-02-04 14:41:26 +01:00
abcnet-lu
d430676e51 [Close] [#4558] Add districts and cantons for Luxembourg 2016-02-03 12:14:26 +01:00
abcnet-lu
d65ee22529 [Close] [#4555] Update label of intermediary VAT rate for Luxembourg (fix inverted labels) 2016-02-03 09:27:48 +01:00
abcnet-lu
755758dd7a [Close] [#4555] Update label of intermediary VAT rate for Luxembourg 2016-02-02 09:28:45 +01:00
bosseal
fb7e1adad7 [Close] [#4553] Update VAT rates for Luxembourg (as they changed in 2015) 2016-02-02 08:23:46 +01:00
Laurent Destailleur
4dc812618a NEW Add index on invoice status 
NEW Add constant MAIN_LOGTOHTML to 0 into other setup by default to save
time when we need to make debug on hosted instance.
 2016-01-21 10:37:43 +01:00
Laurent Destailleur
dc9c5ed5ef Enhance transifex sync 2015-12-18 18:25:09 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-13 16:23:33 +01:00
Laurent Destailleur
a462cd232d Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/product/class/product.class.php
 2015-12-13 15:53:57 +01:00
Raphaël Doursenaud
c0862762a5 Fix #3930 Removed executable bit 
These files doesn't contain executable code and may pose a security
threat.
 2015-12-09 13:28:36 +01:00
Andreas Pachler
4885c64ab3 added social charges for Austria 2015-12-09 09:32:21 +01:00
Juanjo Menent
9ecdfa8be8 Merge pull request #4017 from apachler/develop 
added Regions, Departements and Forme Juridique for Austria
 2015-11-18 22:04:19 +01:00
Andreas Pachler
161b75acfc added Regions, Departements and Forme Juridique for Austria 2015-11-17 06:56:49 +01:00
fmarcet
9e51cf66dd New: Bolivian regions and departmens 2015-11-16 12:34:59 +01:00
Frédéric FRANCE
4160342656 Update llx_c_hrm_function.sql 2015-10-31 10:05:34 +01:00
Laurent Destailleur
2b5746aec3 Add field position into some dictionaries tables 2015-10-29 21:25:18 +01:00
Laurent Destailleur
8df59134a9 Merge pull request #3705 from aspangaro/develop-hrm 
New : Module HRM
 2015-10-22 19:15:49 +02:00
Maxime Kohlhaas
a953a66616 New : allow to define list size for object list on customer card 2015-10-19 19:05:04 +02:00
aspangaro
5d7e05e313 Correct review 2015-10-10 06:00:55 +02:00
aspangaro
6a7892ca52 Add the first tables 2015-10-09 06:41:36 +02:00
Laurent Destailleur
4b103ba8ce Work on a better way to manage modules. All one page. Introduce a way to 
choose order of modules family. We should also be able to introduce
filters.
 2015-10-07 08:13:23 +02:00
aspangaro
710e9327bf Update works 2015-09-07 21:42:12 +02:00
Laurent Destailleur
7d4602f2c4 Fix payment mode type 2015-09-01 15:59:11 +02:00
aspangaro
bd69d37c3a New: Add number of expense reports to pay 2015-08-17 05:29:12 +02:00
Juanjo Menent
7c8b1feaeb FIX: Change Spanish provinces code to ISO 2015-07-22 10:57:25 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +02:00
Laurent Destailleur
ae5b779652 Uniformize code 2015-06-30 01:34:17 +02:00
Laurent Destailleur
55cb103ab0 Maxi debug of new module leave requests 2015-06-27 13:01:44 +02:00
Laurent Destailleur
e0d1cbeb16 Introduce table llx_c_holiday_type 2015-06-21 00:07:03 +02:00
Laurent Destailleur
1b681510a5 NEW Use new select2 component for juridical status, country and state 
selection.
 2015-05-31 12:25:33 +02:00
abb
4e48f24507 added new trigger for supplier invoice unvalidation "BILL_SUPPLIER_UNVALIDATE" in Database 2015-05-23 15:12:24 +01:00
Marcos García de La Fuente
87f97ed545 Merge branch 'develop' into units 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/admin/product.php
	htdocs/product/card.php
 2015-04-18 23:38:14 +02:00
Frédéric FRANCE
cce0ff83b9 Add VAT for Senegal 2015-04-14 16:33:56 +02:00
Laurent Destailleur
ae103e34b8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/compta/facture.php
	htdocs/core/lib/price.lib.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/opensurvey/public/studs.php
	htdocs/projet/element.php
 2015-04-13 13:08:46 +02:00
Laurent Destailleur
74a4bca42c Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-11 22:52:27 +02:00
Laurent Destailleur
6889162d7a Fix: management of vat type 2, 4 and 6 is now ok. 
Works for canada and ivory cost.
 2015-04-11 22:51:53 +02:00
Marcos García de La Fuente
7075ac74c4 Merge branch 'develop' into units 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/class/product.class.php
 2015-04-03 15:45:54 +02:00
Laurent Destailleur
8e9c1c4747 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/list.php
	htdocs/core/class/notify.class.php
	htdocs/core/login/functions_dolibarr.php
	htdocs/exports/export.php
	htdocs/langs/en_US/admin.lang
 2015-04-01 16:33:39 +02:00
Laurent Destailleur
16a620f926 Fix: Deadlock situation (when order were canceled, no way to make 
nothing on it)
Fix: Don't know how I forgot this events into trigger system.
 2015-04-01 16:07:22 +02:00
Laurent Destailleur
6d7b340cee Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/class/dolgraph.class.php
	htdocs/langs/en_AU/main.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/other.lang
 2015-03-16 18:30:30 +01:00
Laurent Destailleur
60c72e13b3 Some fixes into export and translation 2015-03-15 23:39:53 +01:00
Laurent Destailleur
5c36db06f6 Add missing files 2015-03-04 23:04:37 +01:00
Marcos García de La Fuente
b4c84fac9d NEW: [ task #977 ] New option to manage product unit 
Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
 2015-03-01 12:42:38 +01:00
Laurent Destailleur
a05e39f119 Merge pull request #2356 from KreizIT/fix_sqldata 
Fix inconsistent data
 2015-02-18 23:31:22 +01:00
Laurent Destailleur
2e0b2fb012 Work on expensereport module 2015-02-15 22:49:23 +01:00
KreizIT
674585136e Fix inconsistent data 2015-02-14 16:18:18 +01:00
Juanjo Menent
b513aa5455 Adapting spanish localtax2 to 2015 fiscal reforms 2015-02-02 21:32:52 +01:00
Juanjo Menent
2389e332db Adapting spanish localtax2 to 2015 fiscal reforms 2015-02-02 21:28:27 +01:00
Laurent Destailleur
963b9e8583 Merge remote-tracking branch 'origin/3.7' into develop 2015-01-31 19:37:25 +01:00
Laurent Destailleur
720caf8e31 Missing XPF currency 2015-01-31 12:19:06 +01:00
Ion Agorria
48c6897f75 Store per entity SMTP configuration 2015-01-18 03:20:35 +01:00
Laurent Destailleur
4769e26d8e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-18 12:34:41 +01:00
Laurent Destailleur
174428ad31 Data init for canada vat 2014-12-16 01:55:03 +01:00
Ying-Chun Liu (PaulLiu)
81c9d12313 Add Taiwan VAT 5% 
The most common VAT in Taiwan is 5%. This commit adds the VAT for Taiwan.

Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
 2014-12-13 21:41:29 +08:00
Antoine Sirinelli
ec20b38adc Add EIRL in llx_c_forme_juridique 
This a not so new French type of company: Entreprise Individuelle à
Responsabilité Limitée (EIRL).
Migration script also added.
 2014-11-16 23:56:10 +01:00
Laurent Destailleur
cf6a0df3e4 A lot of fix in missing intervention trigger. Align key to use same name 
to avoid future bugs.
 2014-11-03 17:23:02 +01:00
Laurent Destailleur
155452ba91 Fix: Proposal deadlock situation 
New: Add missing trigger PROPAL_CLASSIFYBILLED.
 2014-11-03 16:20:55 +01:00
Laurent Destailleur
0fba70d4d1 Fix: Triggers sending email for intervention and classify billed 2014-10-20 11:35:34 +02:00
Laurent Destailleur
718b3b19b4 Fix: user and date modification not updated 2014-10-20 11:16:51 +02:00
aspangaro
71dafac03c Add favorite button into country dictionary to put value on top select list 2014-10-12 15:28:01 +02:00
aspangaro
f774ff487b Merge branch 'Upstream/develop' 2014-08-18 11:56:49 +02:00
Laurent Destailleur
1ec7d4b488 Vat rate 0 first 2014-08-17 23:32:42 +02:00
Laurent Destailleur
f32125497f Merge pull request #1830 from frederic34/patch-1 
Add VAT rates for Ireland (Eire)
 2014-08-17 23:29:39 +02:00
Laurent Destailleur
45927cc986 Fix pb of links into state-region-country: 
- no more rowid into insert sql requests
- link, so foerign key must be on fk_region->code_region
- label was not visible
- unique keys must be into file .key.sql
 2014-08-17 17:47:25 +02:00
Frédéric FRANCE
8750b60a81 Update llx_c_tva.sql 2014-08-15 16:09:44 +02:00
Laurent Destailleur
18b44ccfae Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into 
aspangaro-develop-favorite

Conflicts:
	htdocs/core/class/html.form.class.php
 2014-08-14 01:04:15 +02:00
aspangaro
b465d71535 Renamed data table 2014-08-13 07:46:56 +02:00
aspangaro
1a87d98357 Qual: Renamed table llx_c_civilite into llx_c_civility 
field civilite into label in the same table and field civilite into civility in other table
 2014-08-12 06:03:27 +02:00
aspangaro
9af336b53b Add accountancy code for trips & fees and renamed libelle field into label 2014-08-10 20:41:52 +02:00
aspangaro
0738103da8 Renamed llx_c_pays to llx_c_country & field "libelle" to "label" 2014-08-10 13:37:39 +02:00
Laurent Destailleur
c11ff57fbe Fix: The type is a code so must not contains any space. 
Fix: State is not linked to region.
 2014-08-03 11:17:24 +02:00
aspangaro
a12f4da978 Accountancy :: account_parent must be an int (again) 2014-07-30 05:49:16 +02:00
Juanjo Menent
09af3e1efe New: Add PYME (base) accountancy spanish plan 2014-07-28 23:22:50 +02:00
frederic34
2b3bd260c6 Update llx_c_shipment_mode.sql 2014-07-24 10:26:11 +02:00
frederic34
304e9d2c83 Update llx_c_shipment_mode.sql 
Update GLS tracking url
 2014-07-24 09:45:46 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Laurent Destailleur
2766b1d8f1 Add record for argentina but disabled by default. 2014-07-11 17:43:57 +02:00
Laurent Destailleur
f1ef8b8faa Comment entries 2014-07-11 17:34:01 +02:00
Laurent Destailleur
32b015e661 New: Type of thirdparties can accept a country (to show list of types 
specific for a country).
 2014-07-11 13:56:35 +02:00
Laurent Destailleur
682d765de9 New: Add country iso code on 3 chars into table of countries. 2014-07-09 00:16:28 +02:00
Laurent Destailleur
1a2ed2138b New: Add new type of event (when type of events are used, not by 
default)
 2014-07-06 21:25:25 +02:00
Laurent Destailleur
ce3fa14511 New: Add event FICHINTER_CLASSIFY_BILLED into list of possible events to 
create an automatic event into agenda.
Qual: Removed hard coded rowid into data init.
 2014-07-06 19:25:15 +02:00
Juanjo Menent
e30649dcd2 [ task #1063 ] Allow edit localtaxes rate for thirds. Works with company 2014-07-03 17:39:31 +02:00
aspangaro
25f2fec473 Fix :: acount_parent must be an int - Final step 2014-06-29 07:02:13 +02:00
Laurent Destailleur
56bc99a558 Include iso code for countries 2014-06-28 21:40:10 +02:00
aspangaro
22bb789374 Chart of accounts BE PCMN-BASE - Account_parent must be an int. 2014-05-29 21:35:29 +02:00
aspangaro
0a670092d5 Fix :: Account_parent must be an int - Step 1 2014-05-23 02:23:32 +02:00
Florian HENRY
45c96e169f fix install 2014-05-13 19:17:50 +02:00
Raphaël Doursenaud
e6c0321fb6 Automatic events for project tasks 2014-04-22 15:30:10 +02:00
Raphaël Doursenaud
c9c75a1c08 Action triggers: Added copyright 
Reindented the whole block because it was out.
 2014-03-27 12:02:15 +01:00
Raphaël Doursenaud
704699f9a1 Action triggers: added missing triggers to the data dictionnary 
These triggers were programmed in
htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
but were nowhere to be found in the interface because they didn't hit the database.
 2014-03-27 12:02:15 +01:00
KreizIT
a80ecc8052 Correct multiline comments not manage by dolibarr 
Avoid error in loading data and also loading data which not be to.
 2014-03-05 12:06:01 +01:00
BENKE Charles
e5e7b4ce6a Update llx_00_c_pays.sql 
adding burundi in pays database
 2014-03-01 12:30:39 +01:00
aspangaro
fda0dec260 Add The base accountancy belgium plan for accounting - Thanks delcroip 
http://www.dolibarr.fr/forum/12-howto--aide/47966-pcmn-plan-comptable-minimum-normalise-belgique
 2014-02-02 06:45:05 +01:00
Laurent Destailleur
cbf1ddaa17 Fix: [ bug #1079 ] External users can't access projects even if it is a 
contact.
 2013-12-01 16:01:33 +01:00
Laurent Destailleur
930328f235 Prepare 3.5 beta 2013-11-17 03:33:58 +01:00
Laurent Destailleur
db7bcfd748 Fix: Sending email from thirdparty must add event into agenda if option 
is on.
 2013-09-25 21:36:40 +02:00
Geoffrey
efacfc9aa3 Add Maghreb regions and departments 2013-07-18 16:49:56 +02:00
Laurent Destailleur
a4abfe1abc New: Can add an event automatically when a projet is create. 2013-07-10 14:46:16 +02:00
Laurent Destailleur
8f71e5fda2 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
 2013-07-07 23:25:03 +02:00
Laurent Destailleur
05461c47cc Fix: vat rate for slovenia 2013-07-07 23:22:00 +02:00
Laurent Destailleur
5385d87995 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/ca_ES/errors.lang
	htdocs/langs/ca_ES/main.lang
	htdocs/langs/ca_ES/opensurvey.lang
	htdocs/langs/ca_ES/paybox.lang
	htdocs/langs/ca_ES/products.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/langs/es_ES/main.lang
	htdocs/langs/es_ES/products.lang
 2013-07-05 21:56:54 +02:00
Laurent Destailleur
46c3b1eb1f Missing vat rate 2013-07-02 01:26:52 +02:00
Laurent Destailleur
71b61fc1f5 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/langs/fr_FR/mails.lang
	htdocs/user/logout.php
 2013-06-18 09:51:37 +02:00
Laurent Destailleur
562fa43d9d Fix: Message is not clear enough. 
Fix: Var was not initialized.
 2013-06-17 23:24:53 +02:00
Laurent Destailleur
eadfa66f2c Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/infobox.class.php
 2013-06-04 22:59:28 +02:00
Laurent Destailleur
c60e94c723 Merge pull request #1018 from fappels/develop 
Added flemish legal forms to belgium entries
 2013-06-03 14:43:35 -07:00
Laurent Destailleur
12973dbdb4 Look: Minor enhancement 
Fix: Option to fix bug to send email on by default.
 2013-06-03 22:06:28 +02:00
Francis Appels
1a480b4e68 modified abrviation of code 227 2013-06-03 16:34:44 +02:00
Francis Appels
7c0f7e1630 Added flemish legal forms to belgium entries 
Added flemish legal forms to belgium entries, so flemish company can
show correct info on his commerial documents
 2013-06-01 17:21:39 +02:00
Laurent Destailleur
9b96e38a35 Fix: Update vat rates for canada 
Conflicts:
	htdocs/langs/fr_CA/main.lang
 2013-06-01 02:49:44 +02:00
Laurent Destailleur
0b3a52395d Fix: Missing mayotte 2013-06-01 02:21:39 +02:00
Laurent Destailleur
b3adbf53e5 Fix data for greece 2013-05-17 00:47:50 +02:00
Marcos García
a5009fd555 Corrected es_ES translations 2013-05-04 19:35:38 +02:00
simnandez
7b70fc4bf3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-04-07 14:30:44 +02:00
Laurent Destailleur
4e5a71fb22 New: Add local and vat rate for peru 2013-04-06 18:59:22 +02:00
simnandez
50548601ce Resolve conflicts 2013-04-06 08:20:57 +02:00
Regis Houssin
06485b065b Fix: bug #791 2013-04-04 08:56:19 +02:00
Laurent Destailleur
fbf8d410d2 New: Support revenue stamp onto invoices 2013-03-23 17:34:23 +01:00
Laurent Destailleur
c215974c8c Add missing vat rate for saudi arabia 2013-03-12 12:20:06 +01:00
Laurent Destailleur
e731d954b3 Translation 2013-03-12 12:00:53 +01:00
Laurent Destailleur
7138c6b0f9 T 2013-03-12 11:59:52 +01:00
Cedric GROSS
d16691c856 Add trigger BILL_UNVALIDATE when invoice is unvalidate 2013-03-09 17:38:35 +01:00
Laurent Destailleur
2a67af3c94 New: when adding an action, we can define a free code to tag it for 
a specific need.
 2013-03-08 12:04:01 +01:00
Laurent Destailleur
d92fd0eaed New: Add table, dictionnary and option to enable "revenue stamp". 2013-03-06 16:09:00 +01:00
frederic34
9333fdb97f WIP : Admin for Carriers 2013-02-23 15:23:33 +01:00
frederic34
67c06225a5 WIP : Admin for carriers 2013-02-22 14:18:51 +01:00
frederic34
de4bc7f39d Fix : It was a bad idea to add COL in the code name of new carriers 2013-02-22 08:56:14 +01:00
frederic34
d7f83c3520 New: Add some carrier 2013-02-21 11:23:12 +01:00
Laurent Destailleur
b21cb5b899 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture.php
	htdocs/filefunc.inc.php
 2013-02-17 17:25:38 +01:00
Laurent Destailleur
365680d90e Fix: Missing vat rates 2013-02-13 21:25:17 +01:00
Laurent Destailleur
0383080d90 Fix: bad menu file name 2013-01-28 17:37:40 +01:00
Laurent Destailleur
9eaf8af341 Fix: Removed warning (this can be normal behaviour) 
Fix: menu manager name has changed
 2013-01-28 15:35:29 +01:00
Laurent Destailleur
05bd489b82 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/admin/index.php
 2013-01-21 01:12:19 +01:00
Laurent Destailleur
9cf405f9d2 Fix: syntax error 2013-01-21 01:06:52 +01:00
Laurent Destailleur
abb6daf2dc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
 2013-01-19 16:29:16 +01:00
simnandez
a57f291aa2 Fix: Bad Spanish departament name 2013-01-18 09:28:54 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Laurent Destailleur
f57409ddcd Merge remote-tracking branch 'origin/3.3' into develop 2013-01-15 12:06:41 +01:00
Laurent Destailleur
285bcbecb7 Fix: init of new syslog handler system 2013-01-14 17:12:13 +01:00
Laurent Destailleur
0861fbfeb6 Fix: Missing kenya currency 2013-01-13 23:47:23 +01:00
eldy
2c59c6311f Merge remote-tracking branch 'origin/3.3' into develop 2013-01-06 21:36:39 +01:00
eldy
492d00ee86 Fix: Syntax error with pgsql 2013-01-06 20:45:03 +01:00
Cedric GROSS
6a9c3dee52 Add SASU form 2013-01-05 17:07:25 +01:00
simnandez
d0265db3d2 Fix: Modify Spanish localtax2 to new rate 2013-01-05 09:07:01 +01:00
Laurent Destailleur
753d79f181 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2012-12-30 17:14:06 +01:00
Laurent Destailleur
0d09de0cf8 Fix: Normalize trigger names for fichinter module. 2012-12-30 17:13:43 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
5e05e0aa55 Fix: Trigger names 2012-12-29 17:34:52 +01:00
Laurent Destailleur
70be706347 New: Add greece regions and provinces 2012-12-09 20:01:16 +01:00
Laurent Destailleur
db91526643 Fix: Solve conflict into migration/backup/restore (child tables 
must be after parent tables).
Fix: Migration of old version
 2012-12-08 14:16:39 +01:00
Laurent Destailleur
bac4bf07a3 New: Add patch from pgrand to start link of several contacts onto an 
event
 2012-12-03 20:19:35 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50 
commits !
 2012-12-01 15:45:05 +01:00
Laurent Destailleur
af637c8afb Qual: Removed "dolibarr" into default email sender. 2012-11-21 14:45:02 +01:00
Laurent Destailleur
28b4a03432 Fix: Correct vat 2012-11-14 20:49:19 +01:00
Laurent Destailleur
661d37eacf Fix: New vat for switzerland 2012-11-08 12:15:15 +01:00
Laurent Destailleur
4cd1bbb0ca Fix: bad data init 2012-11-05 17:01:05 +01:00
Laurent Destailleur
8ea48b28eb New: More complete setup for bank ids according to countries 2012-10-31 00:46:46 +01:00
Regis Houssin
0441c6dd46 Merge pull request #417 from aspangaro/develop 
Continue working on accountancy
 2012-09-28 02:43:54 -07:00
Laurent Destailleur
6c769cfaf3 Fix: postgresql compatibility 
Qual: Removed deprecated code
 2012-09-27 23:54:47 +02:00
Spangaro Alexandre
e4391207e4 Add new dictionnary to edit accountingsystem 2012-09-26 20:37:28 +02:00
Spangaro Alexandre
d8481fa19b Minor fix 2012-09-23 12:05:03 +02:00
Laurent Destailleur
44591bd756 Use a specific type to isolate type of event that are event 
automatically added into agenda from other predefined events.
 2012-09-20 00:18:29 +02:00
simnandez
5344d0c330 Fix: Update spanish VAT data for first instalations 2012-09-19 16:15:35 +02:00
simnandez
31b91e68c1 Fix: Update spanish VAT data for first instalations 2012-09-19 16:09:41 +02:00
simnandez
d18488966b Fix: Update spanish VAT data for first instalations 2012-09-19 15:51:00 +02:00
Laurent Destailleur
e68f861923 New: Add more test and enhancement to make new calcul_price function 
more reliable. We need to add more PHPUnit test case on this function
(testcase using localtax1 and localtax2).
 2012-09-11 01:09:34 +02:00
Christophe Battarel
2e4aa1131a prepare database for local taxes management 
add localtax1_type and localtax2_type in database.
these type are char(1) and support following values :
'0' : local tax not applied
'1' : local tax apply on products and services without vat (vat is not applied on local tax)
'2' : local tax apply on products and services before vat (vat is calculated on amount + localtax)
'3' : local tax apply on products without vat (vat is not applied on local tax)
'4' : local tax apply on products before vat (vat is calculated on amount + localtax)
'5' : local tax apply on services without vat (vat is not applied on local tax)
'6' : local tax apply on services before vat (vat is calculated on amount + localtax)
'7' : local tax is a fix amount applied on global invoice
 2012-09-10 11:00:35 +02:00
Laurent Destailleur
6e90e60268 Fix data init 2012-09-06 23:46:35 +02:00
Laurent Destailleur
246f3b5bb8 New: Add the holiday module (provided by teclib with permission to add 
it by default).
 2012-09-05 03:26:57 +02:00
Regis Houssin
7ff475c462 Fix: Modify spanish VAT to new rates (Juanjo) 2012-09-01 18:43:51 +02:00
Marcos García
7be72c39b1 Fixed SQL problems with llx_accounting.sql 2012-08-27 03:17:57 +02:00
Spangaro Alexandre
9050431f87 Simply way to update chart of accounts 2012-08-26 17:11:19 +02:00
Regis Houssin
4a5d89e6cc Fix: move barcode type entries in module descriptor for best 
compatibility with multicompany
 2012-08-22 17:44:52 +02:00
Laurent Destailleur
c664ac3cfa Fix: Default value was not defined 2012-08-20 00:27:38 +02:00
Regis Houssin
48efabc8a4 Fix: remove deprecated function and avoid warnings 2012-08-15 09:06:36 +02:00
Laurent Destailleur
b3b598c068 New input reason into dictionnary. 2012-08-09 18:33:45 +02:00
Maxime Kohlhaas
44b84b2177 task # 326 : Add a numbering module to suggest automatically a product ref 2012-08-09 01:41:55 +02:00
Laurent Destailleur
bf94d05293 New: Add great britain provinces 2012-07-28 03:12:34 +02:00
Laurent Destailleur
df31ae2b0e New: Add canadian provinces 2012-07-10 17:51:29 +02:00
Laurent Destailleur
dc904ddf5f Fix: vat rates 2012-05-10 23:02:05 +02:00
Laurent Destailleur
63ce05b939 New: Localize for NL 2012-05-10 00:35:20 +02:00
Laurent Destailleur
9913e87410 New: Add more payment conditions 2012-05-05 02:56:38 +02:00
Laurent Destailleur
26d5392e34 Add more sources 2012-04-21 18:22:10 +02:00
Laurent Destailleur
df13921ed4 Germany data not complete. 2012-04-14 19:31:10 +02:00
Laurent Destailleur
c876b6f2be Fix: debian epiphany and iceweasel browsers. 2012-04-14 03:20:10 +02:00
Regis Houssin
c2d162d4c6 Fix: add Monaco VAT rates 2012-04-11 16:52:55 +02:00
Vinicius Nogueira
78c5fc8cff Add Tax: Brasil 
Zero rate for the invoices to suppliers can be fulfilled.
 2012-04-07 01:45:48 -03:00
Laurent Destailleur
03cfec7904 Fix: Add missing sao polo for brazil 2012-04-05 00:13:06 +02:00
simnandez
00474e119f Fix: Bad departement name 2012-03-16 09:15:29 +01:00
Laurent Destailleur
6cdd6fb137 Revert "Change main currency name with current name of currency because value is used as label to show amount when using numberword module." 
This reverts commit 83d775d0ed.
 2012-03-09 10:11:49 +01:00
Laurent Destailleur
83d775d0ed Change main currency name with current name of currency because value is 
used as label to show amount when using numberword module.
 2012-03-09 09:33:18 +01:00
Regis Houssin
ee86da0e1e Fix: refactorize llx_c_currencies and currency symbol 2012-03-08 11:49:38 +01:00
Laurent Destailleur
4b607f29cd New: Add brazilian states 2012-02-04 19:00:24 +01:00
Alexandre Spangaro
cd058b6726 The last file have pushed is wrong - No 'doublon' in rowid - Now it's better 2012-01-18 06:15:25 +01:00
Spangaro Alexandre
a0829556ee Update 
Signed-off-by: Spangaro Alexandre <alexandre.spangaro@gmail.com>
 2012-01-17 15:11:04 +08:00
Spangaro Alexandre
36edb00002 MAJ plan de comptes FR 2012-01-17 15:11:03 +08:00
Laurent Destailleur
ccfced2aff Work on sqlite driver 2012-01-02 03:02:45 +01:00
Laurent Destailleur
6f63c5ecff Work on PDO Sqlite driver 2012-01-02 02:46:12 +01:00
simnandez
e359cbcf3a Add Venezuela data 2011-12-26 16:36:12 +01:00
Laurent Destailleur
0209c7dd19 Change order of fields. 2011-12-08 01:26:25 +01:00
Laurent Destailleur
e0ffbc50b6 Add vat rate 7 2011-12-03 19:30:55 +01:00
eldy
b0b3d5553d Fix: Update italy vat rate 2011-10-07 01:35:46 +02:00
Regis Houssin
03711cf6f2 Fix: remove obsolete tags 2011-08-27 19:15:14 +00:00
Laurent Destailleur
fc47a48979 New: Add ru_UA informations 2011-08-22 22:48:34 +00:00
Laurent Destailleur
1858423d1f Fix: A code must not contain space 2011-08-05 22:33:04 +00:00
Laurent Destailleur
ce4711f290 Fix: Avoid errors into rpm packages 2011-08-03 01:25:43 +00:00
Laurent Destailleur
cd67cc9dfe Fix: Duplicate entries 2011-07-31 12:31:00 +00:00
Laurent Destailleur
0fb3d55b0e Add barbaros info 2011-07-28 18:34:45 +00:00
Juanjo Menent
d82b3ad31b Add Mexico society types 2011-07-28 15:09:53 +00:00
Juanjo Menent
ee020a7685 Add Mexique data: VAT, Currency and ProfId 2011-06-06 14:08:03 +00:00
Laurent Destailleur
e483cf4148 Trans: Use english labels. 2011-06-05 23:05:12 +00:00
Regis Houssin
1c3115a8d9 New: unified action and event with trigger name 
Fix: remove entity and active fields
Fix: reorder records
 2011-06-05 09:08:11 +00:00
Regis Houssin
6d4b66a618 New: unified action and event with trigger name 2011-06-05 08:19:09 +00:00
Regis Houssin
994d41aad1 New: unified action and event with trigger name 2011-06-04 18:49:45 +00:00
Regis Houssin
857006c456 Works on possibility to send shipping by mail 
Fix: uniformize code
 2011-06-02 17:20:24 +00:00
Laurent Destailleur
2c3200c076 New: Add vat rate for norway 2011-05-30 20:58:18 +00:00
Regis Houssin
8ec13d4878 New: add shipment method "Lettre Max" for France 2011-05-25 16:53:40 +00:00
Regis Houssin
38a097b2fb New: add shipment method "Lettre Max" for France 2011-05-25 16:53:39 +00:00
Laurent Destailleur
62e680cbf2 MAIN_CONFIRM_AJAX is on by default 2011-05-18 12:07:38 +00:00
Laurent Destailleur
87ed0c1ea4 Removed property use_popup_calendar. USe conf->global instead. 2011-05-18 11:57:33 +00:00
Laurent Destailleur
ff6182f62f Fix a lot of bug in "source" field: 
- missing creation table
- autoselect when creating order from proposal
- do not show proposal as origin when creating proposal
- use code instead of id
- use label in english
Also renamed table demand_reason into input_reason to match other table input_method.
 2011-05-07 11:36:47 +00:00
Juanjo Menent
36b373b904 Qual: Add currency, idprod1, tax and lang for Honduras 2011-05-02 08:49:44 +00:00
Laurent Destailleur
d02d52f907 Add italian companies type 2011-04-23 10:04:52 +00:00
Laurent Destailleur
060dd7a7f8 Add italian provinces 2011-04-23 10:01:59 +00:00
Laurent Destailleur
becd77a04a Renamed table llx_c_commande_fournisseur_methode into an english and more generic name: llx_c_input_method 2011-04-21 18:23:05 +00:00
Juanjo Menent
4352a208af Qual: Add regions and departaments for Honduras 2011-04-21 09:11:49 +00:00
Juanjo Menent
76ea7d84a0 Qual: Add regions and departaments for Colombie 2011-04-21 07:34:49 +00:00
Juanjo Menent
ebcb122654 Qual: Add regions and departaments for Mexique 2011-04-20 22:46:47 +00:00
Juanjo Menent
9833e42965 Qual: Add regions and departaments for Chile 2011-04-16 11:30:57 +00:00
Juanjo Menent
133266bb38 Qual: Add regions and departaments for Chile 2011-04-16 10:20:37 +00:00
Laurent Destailleur
a64fa24475 Trans 2011-04-07 07:39:21 +00:00
Regis Houssin
00605cb792 Fix: rename table 2011-04-01 10:31:18 +00:00
Laurent Destailleur
895882a31e Add vat rate for new zealand 2011-02-22 08:39:59 +00:00
Laurent Destailleur
a8f9a9d0c6 New: a specialized menu is now used when using smartphones 2011-02-16 19:59:16 +00:00
Laurent Destailleur
684eddf9fe Removed old constant name for menu management. 2011-02-13 13:22:54 +00:00
Laurent Destailleur
ca6f631e36 New: Enhancement in actions list management. Can define an order. Add check during dictionnary add. 2011-02-02 13:29:54 +00:00
Laurent Destailleur
071fba1687 Fix: Bad label 2011-01-30 23:11:35 +00:00
Regis Houssin
51b1a6a14d Fix: some constants already defined with modules activation 2011-01-30 10:00:10 +00:00
Laurent Destailleur
ac30d5ee2e Add civility for doctor 2011-01-23 18:50:25 +00:00
Laurent Destailleur
2feebcf486 Fix: Bad label 2011-01-15 14:51:59 +00:00
Laurent Destailleur
c5fe65d54b Fix: Bad vat rates for us 2011-01-10 00:02:05 +00:00
Regis Houssin
b36c9cfb68 Fix: add new standard vat rate for united kingdom 2011-01-04 08:45:02 +00:00
Regis Houssin
3018060dc1 Fix: add new standard vat rate for united kingdom 2011-01-04 08:28:04 +00:00
Laurent Destailleur
25f26d036e Fix: VAT is replaced with Sales tax in US 2010-12-23 01:36:44 +00:00
Laurent Destailleur
1da718281b Fix: VAT is replaced with Sales tax in US 2010-12-23 01:36:44 +00:00
Laurent Destailleur
70f76f23eb No need to add constants when value is 0. This is to save lines into database. 2010-12-18 03:53:30 +00:00
Juanjo Menent
9fe2aefd76 task #10611: Add option to choose order of key in bank account info on PDF 2010-12-17 16:54:37 +00:00
Laurent Destailleur
86ffc32195 Qual: Uniformize a lot of code (supplier_invoice => invoice_supplier, same for order) 
New: Add link between supplier invoices and supplier orders.
 2010-12-13 13:16:02 +00:00
Juanjo Menent
21d35ccda8 Task #10786: works for internal users in setup module 2010-12-07 20:57:34 +00:00
Laurent Destailleur
375efac3e3 Restore work lost by savannah backup 2010-12-01 21:51:13 +00:00
Laurent Destailleur
59c387192e Fix: Postgresql compatibility 2010-11-16 20:14:29 +00:00
Laurent Destailleur
a8a423ffb9 Remove warning 2010-11-14 14:53:10 +00:00
Regis Houssin
1ed47522e9 Fix: bad label 2010-10-21 08:29:03 +00:00
Laurent Destailleur
ea53a09d5c Add italian provinces 2010-10-06 18:29:07 +00:00
Juanjo Menent
eb9365d74f Task #8618: Prepare database 2010-10-06 18:23:11 +00:00
Laurent Destailleur
5a144eee2f Fix: Syntax error 2010-10-05 23:33:44 +00:00
Laurent Destailleur
90f8dec16d Add iceland VAT rates 2010-09-30 08:06:29 +00:00
Juanjo Menent
6d20f728b6 Remove old Spanish tax 2010-09-29 16:37:43 +00:00
Laurent Destailleur
0de3bff0b7 Qual: Menu management is simpler (no difference between left and top in setup). 2010-09-29 10:10:33 +00:00
Regis Houssin
95a134b316 Fix: this constant already defined in module 2010-09-24 17:25:42 +00:00
Regis Houssin
a98c55b126 Add smartphone menu management, based from Auguria menu 2010-09-23 10:02:27 +00:00
Laurent Destailleur
f79e751875 Add argentina default vat rate 2010-09-19 16:26:16 +00:00
Laurent Destailleur
319f960b1a Add MRO currency 2010-09-15 15:11:57 +00:00
Laurent Destailleur
24b96584f8 Add empty vat rate for us 2010-09-15 12:27:26 +00:00
Laurent Destailleur
153d2080f0 Qual: Uniformize dictionnary table names. 2010-09-06 00:02:55 +00:00
Laurent Destailleur
cb73e03168 Qual: Uniformize dictionnary table names. 2010-09-05 23:39:37 +00:00
Laurent Destailleur
24ce9abe99 Fix: Short code for hong kong dollar 2010-09-04 11:53:49 +00:00
Laurent Destailleur
28206f5662 New: Add more default vat rate 2010-08-30 22:00:06 +00:00
Laurent Destailleur
ceb8a3e659 New: Add more default vat rate 2010-08-30 21:57:10 +00:00
Laurent Destailleur
5687126662 No change on default theme in this version. 2010-07-15 00:28:12 +00:00
Laurent Destailleur
e9eb0b0203 Fix: Minor fix in themes 2010-07-14 12:29:56 +00:00
Laurent Destailleur
41c52af675 Fix: Removed countries that are regions 2010-07-09 23:27:44 +00:00
Laurent Destailleur
7f288ad381 Translate old deprecated strings 2010-06-27 21:42:52 +00:00
Laurent Destailleur
55b9d6b86a Fix: Removed not translated combo box. 2010-06-24 19:00:21 +00:00
Laurent Destailleur
1ad2649fe6 Add indian provinces 2010-06-16 19:58:12 +00:00
Juanjo Menent
ee03ca1238 New: Add data for Argentina 2010-06-14 18:36:59 +00:00
Laurent Destailleur
9e449b2c87 Add china VAT 2010-06-09 18:45:50 +00:00
Laurent Destailleur
7ef75ba1e7 New: Add india VAT rate 2010-06-09 18:37:47 +00:00
Laurent Destailleur
c1e50c273a New: Added india to show state in address. 2010-06-08 00:06:22 +00:00
Juanjo Menent
830c9e0239 New: Add Spanish VAT rate from July 2010 2010-06-07 18:54:59 +00:00
Laurent Destailleur
542b5c7e64 Keep key of tax line starting with "TAX". 2010-05-18 20:47:07 +00:00
Regis Houssin
e5ac48b844 Add social security contributions for Belgium 2010-05-18 17:10:33 +00:00
Regis Houssin
b23169c4c4 Add social security contributions for Belgium 2010-05-18 17:06:18 +00:00
Laurent Destailleur
2a29f90d14 Fix: Bad path for some includes 
New: Add more predefined actions
 2010-05-12 11:58:58 +00:00
Regis Houssin
f079491f22 Fix: bug #29752 2010-05-03 16:03:50 +00:00
Laurent Destailleur
9626a1bc4f Fix: Missing triggers for suppliers invoices 2010-04-25 21:22:06 +00:00
Laurent Destailleur
149d6ae8dd Fix: Do not use $_ENV anymore. 2010-04-18 16:08:53 +00:00
Laurent Destailleur
9e8b347fdc Add chile VAT rate 2010-03-27 17:40:41 +00:00
Juanjo Menent
de13f32818 Works on enhancement of local taxes. Spanish RE added as localtax1 
Fix: duplicated rowid in Louxembourg and Marroco data
 2010-02-28 16:32:54 +00:00
Laurent Destailleur
ad2d16780c New: Add saudi ryial in currencies 2010-02-04 19:01:10 +00:00
Regis Houssin
d94473e164 Works on enhancement of project tasks 
Fix: use task.class.php
 2010-01-25 22:24:40 +00:00
Laurent Destailleur
cbbbbe4186 Add init data for san salvador 2010-01-23 01:08:06 +00:00
Laurent Destailleur
77ac9bb222 Add init data for san salvador 2010-01-22 23:37:43 +00:00
Regis Houssin
e5f4356afc Add numbering and pdf module in project 2010-01-12 18:02:23 +00:00
Laurent Destailleur
5558b0d081 New: Module notification can send mail on order or proposal validation. 2010-01-09 01:56:33 +00:00
Regis Houssin
5ec50935ed Fix: UK standard rate change to 17.5 2010-01-08 10:09:43 +00:00
Regis Houssin
dbc211ce3b Fix: current entity by default 
Todo: some constant already defined in module ?
 2010-01-05 17:21:01 +00:00
Laurent Destailleur
0e445e8061 Ajax confirm is on by default 2009-12-03 22:25:20 +00:00
Laurent Destailleur
5180f0b7bc Fix: Default log level is debug 2009-11-17 23:01:47 +00:00
Laurent Destailleur
d49e364c78 Fix: Bad values in data 2009-10-26 01:04:00 +00:00
Laurent Destailleur
030074cf83 Fix: Data must be loaded in the correct order. 2009-10-26 00:34:09 +00:00
Laurent Destailleur
2060d79fc2 Qual: Uniformize code. 
Fix: Social contributions was french for all countries.
 2009-10-25 23:58:52 +00:00
Laurent Destailleur
0e113ea493 Qual: Uniformize code. 
Fix: Social contributions was french for all countries.
 2009-10-25 20:48:44 +00:00
Laurent Destailleur
05533ffe77 Qual: More portable SQL 2009-10-25 18:53:09 +00:00
Regis Houssin
a542ab472c Fix: split data.sql 
Fix: defined mysqli driver by default
 2009-10-25 07:42:54 +00:00
Laurent Destailleur
beb80b4160 Comment in english 2009-10-15 13:57:54 +00:00
Regis Houssin
32746494e3 Ajout des cantons Suisse 
Fix: uniformisation  du code
Fix: utilisation du rowid pour les dpartements car le code pourrait tre identique d'un pays  un autre.
Fix: utf-8
TODO: peut tre faudrait-il faire un fichier data diffrent par table pour que ce soit mieux lisible.
 2009-10-15 13:33:33 +00:00
Laurent Destailleur
8089dd48fd Move mysql/pgsql/mssql dir into install directory. 2009-10-07 18:17:55 +00:00