lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
91,219 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-1
Commit Graph

636 Commits

Author SHA1 Message Date
Laurent Destailleur
6970d066f8 Better compatibility 2019-03-19 11:23:38 +01:00
Laurent Destailleur
81fb18befe Complete unit table 2019-03-19 11:19:46 +01:00
Laurent Destailleur
3050366372 Fix table of units already exists. Merge duplicate c_measuring_units 
with c_units.
 2019-02-14 13:02:44 +01:00
florian HENRY
e2d13c0e1f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_importproduct_measuringunit

Conflicts:
	htdocs/contact/consumption.php
	htdocs/webservices/server_productorservice.php
 2019-02-13 09:23:52 +01:00
Laurent Destailleur
5fceee3048 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/8.0.0-9.0.0.sql
 2019-02-12 19:02:19 +01:00
Laurent Destailleur
f7d183f3ef Add Kosovo country 2019-02-12 17:43:38 +01:00
florian HENRY
eba4be2335 ad missing files 2019-02-12 17:03:47 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
markus
a45ea9239d Rename consts and cleanup 2019-01-19 14:24:20 +01:00
torvista
54c56ff069 minor error 2018-12-16 22:15:44 +01:00
torvista
6ce76903a5 removed double quotes as per Travis failure 2018-12-16 21:22:31 +01:00
torvista
f5d1eea4dc added regions and provinces for Andorra, Hungary, Portugal, Slovenia. 
Spain added postcodes and re-ordered sql in province order to make a logical drop-down picking list.
 2018-12-16 18:28:11 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
cd3716ff9f Dolibarize module ticket 2018-12-08 16:37:41 +01:00
Laurent Destailleur
2f2df12f59 Complete dictionary 2018-11-26 18:02:25 +01:00
Laurent Destailleur
f455e32bef FIX Some modules templates were visible when it should not 2018-11-20 16:22:16 +01:00
Laurent Destailleur
39621ec686 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-11-19 20:07:51 +01:00
Laurent Destailleur
fb6aa01207 FIX #10030 better german chart 2018-11-19 20:04:31 +01:00
Laurent Destailleur
7f33403d43 Fix translation 2018-11-17 22:55:13 +01:00
markus
ac0f46f9e5 for Denmark: forme_jurisdisque additions 2018-11-15 11:10:54 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
67fbb3dbb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/notify.class.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-11-03 19:15:52 +01:00
Laurent Destailleur
c9ef298839 Fix setup template emails 2018-10-31 11:38:04 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
25a374bd9a NEW Notification module support expense report+holiday validation and 
approval event.
 2018-10-25 12:45:13 +02:00
Laurent Destailleur
01adaf253c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/product/list.php
 2018-10-24 03:35:44 +02:00
Laurent Destailleur
b7d91c30d9 FIX missing symbol for indian rupies 2018-10-23 12:38:12 +02:00
atm-quentin
8442b405b2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception 2018-10-23 10:27:46 +02:00
atm-quentin
83c8a78628 NEW auto event msg 2018-10-15 17:08:28 +02:00
Carsten Brandt
fee46ac845 Update german accounting file to use rowid 
- fix "TODO Fix this file to use rowid"
 2018-09-27 09:39:00 +02:00
Carsten Brandt
73ed340766
Update german accounting file to use rowid 
- fix "TODO Fix this file to use rowid"
 2018-09-26 11:52:06 +02:00
Laurent Destailleur
e07ce644e8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/langs/en_US/admin.lang
 2018-09-18 11:49:35 +02:00
Laurent Destailleur
2d8eb034e3 FIX Maxi debug to allow to load chart of account with multicompany 2018-09-17 21:02:07 +02:00
Laurent Destailleur
540999faa5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/lib/company.lib.php
 2018-09-03 14:06:51 +02:00
Laurent Destailleur
47655f0725 Add comment as FIXME 2018-09-03 14:00:12 +02:00
Laurent Destailleur
d050c0654b FIX Add "-- ADD xxx to rowd" to avoid rowid conflict on account chart 2018-09-03 13:14:25 +02:00
Laurent Destailleur
c423aebdad Revert "FIX "account_parent" is linked with "account_number" instead rowid" 
This reverts commit b1a340b193.
 2018-09-03 12:51:20 +02:00
Laurent Destailleur
e9f3c131ec Add the line -- ADD xxx to rowid 2018-09-03 12:42:26 +02:00
Laurent Destailleur
3593b5ac51 Revert "Revert " New:Algerian Chart of accounts"" 
This reverts commit 1d644a33a3.
 2018-09-03 12:39:01 +02:00
Laurent Destailleur
1d644a33a3
Revert " New:Algerian Chart of accounts" 2018-09-03 11:42:01 +02:00
Bahfir Abbes
09b75fc53e
Update llx_accounting_account_dz.sql 2018-09-02 16:52:41 +01:00
Abbes Bahfir
28a146fb5e New:Algerian Chart of accounts - First version 2018-09-02 16:44:07 +01:00
Regis Houssin
b1a340b193 FIX "account_parent" is linked with "account_number" instead rowid 2018-08-03 14:01:00 +02:00
florian HENRY
2f2ca16e2b Add DELETE Trigger action into admin event agenda log 2018-07-10 16:44:14 +02:00
Regis Houssin
a78ba20c9b Fix: update price format 2018-06-25 12:20:08 +02:00
Regis Houssin
3d9b191806 Fix: restore and update example data 2018-06-25 12:16:02 +02:00
Regis Houssin
a6729b0bd1 Fix: change field name and remove obsolete data 2018-06-25 09:10:24 +02:00
Laurent Destailleur
4900f1f1f1 Fix sql coding style 2018-06-13 23:10:29 +02:00
Laurent Destailleur
ed41731a50
Merge pull request #8954 from mwelters/develop 
German Accounting Plan SKR03 and SKR04 (mysql/data)
 2018-06-13 21:45:02 +02:00
Laurent Destailleur
c09e69aeb6
Update llx_accounting_abc.sql 2018-06-13 21:44:43 +02:00
Markus Welters
885904132c
Update llx_accounting_abc.sql 2018-06-13 09:37:12 +02:00
markus
f3a7e2205b fix typo 2018-06-09 19:07:33 +02:00
markus
9ce10ccef7 Adding SKR03 and SKR04 2018-06-09 19:00:24 +02:00
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