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
Florian HENRY
556ba2b369 statart card 2021-02-20 23:17:48 +01:00
Alexandre SPANGARO
3f08a9dcde Add IS 2021-02-18 22:08:31 +01:00
Alexandre SPANGARO
8696bebee1 NEW: Update list of taxes by default for France 2021-02-18 22:05:46 +01:00
Laurent Destailleur
532734a2bb Add regions of TW 2021-02-16 17:45:09 +01:00
Laurent Destailleur
dbe6d43dcd Add states of TW 2021-02-16 17:39:27 +01:00
Laurent Destailleur
d16276ea2c Clean code 2021-02-16 11:15:42 +01:00
Laurent Destailleur
d183a7eedf
Merge pull request #16288 from FHenry/dev_EventOrganisation_setuppage 
wip : Event Organization module - PR-1 - setup page  #FoundationFunding
 2021-02-15 15:59:19 +01:00
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
 2021-02-15 13:12:27 +01:00
Laurent Destailleur
6e21839169 Fix migration 2021-02-15 11:50:59 +01:00
Florian HENRY
b5055a5edb config pages ok 2021-02-14 16:41:57 +01:00
Laurent Destailleur
5392e11370 Add missing ethiopian birr currency 2021-02-11 23:05:01 +01:00
Laurent Destailleur
8041ef641a
Merge branch 'develop' into dev_typent_jax_workcorrectly 2021-02-08 15:29:36 +01:00
Laurent Destailleur
eee49b9132 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/delais.php
 2021-02-04 13:50:07 +01:00
Laurent Destailleur
eca010937f FIX Trigger on expense report was not fired 
FIX Bad dates on info tabs
 2021-02-04 11:56:53 +01:00
Florian HENRY
2d77787bba Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_typent_jax_workcorrectly 2021-02-04 09:06:36 +01:00
Florian HENRY
86e9398b79 no inner join 2021-02-04 09:05:58 +01:00
Laurent Destailleur
f301635681 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-02-03 21:02:32 +01:00
Laurent Destailleur
348fd0fcb5 FIX #16160 2021-02-03 19:36:10 +01:00
Laurent Destailleur
250b530b29 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
 2021-01-18 11:07:46 +01:00
Frederick Jost Zweig
267caf7ac8 Added 'US-BASE' and 'CA-ENG-BASE' to models list 
Added 'US-BASE' and 'CA-ENG-BASE' chart of accounts names to the 'Chart of accounts models' list.
 2021-01-18 02:22:23 +01:00
Frederick Jost Zweig
ed796cd500 Removed 'pcg_subtype' column 
The 'pcg_subtype' column of the table 'llx_accounting_account' has been removed in recent Dolibarr versions, so it has to be removed in this file also. Otherwise, the US chart of account can't be enabled.
 2021-01-18 02:22:16 +01:00
Laurent Destailleur
55b46ca149
Merge pull request #15318 from bafbes/abb120353 
New: add notification on ACTION_CREATE event
 2021-01-07 11:17:33 +01:00
Laurent Destailleur
1ab459e854 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 16:19:08 +01:00
Laurent Destailleur
601d4618d4 Missing vat rates 2021-01-02 14:52:37 +01:00
Alexandre SPANGARO
9f0434eb69 Merge remote-tracking branch 'upstream/develop' into 14a2 2020-12-29 04:50:32 +01:00
Laurent Destailleur
10bef6eb03 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/opensurvey/class/opensurveysondage.class.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/card.php
 2020-12-04 19:24:29 +01:00
Florian HENRY
7a5a6a14f0 fix At install insert shipment mode failed 2020-12-04 09:10:36 +01:00
Laurent Destailleur
bfe4eb7309 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/emailcollector_card.php
	htdocs/core/modules/modProduct.class.php
 2020-12-03 11:26:53 +01:00
Laurent Destailleur
450aa7cbea
Merge pull request #15597 from dolibit-ut/patch-51 
Update llx_accounting_abc.sql
 2020-12-02 19:47:19 +01:00
Laurent Destailleur
4c8043bd9f
Merge pull request #15598 from dolibit-ut/patch-52 
Update llx_const.sql
 2020-12-02 19:17:31 +01:00
Laurent Destailleur
9d2a78003e
Merge pull request #15606 from Zebedeu/develop 
New add VAT RAT for Angola
 2020-12-02 18:34:32 +01:00
Marcio Zebedeu
561c7438bc
New Add Angola City name 
Angola province/city support added
 2020-12-02 12:36:15 +01:00
Marcio Zebedeu
73edd081dd
New Support for Angolan currency added 
Support for Region  Angola added
 2020-12-02 12:04:35 +01:00
UT from dolibit
8944670c03
Update llx_accounting_account_ca.sql 
subtype_pcg removed
 2020-12-02 08:28:16 +01:00
Stephane Lesage
1c4876b417 more transporters in llx_c_shipment_mode.sql 2020-12-01 21:17:03 +01:00
Marcio Zebedeu
f7a8a02b98
Update llx_c_tva.sql 2020-12-01 20:07:58 +01:00
Marcio Zebedeu
de9a32972f
New currency for Angolan added 
Support for Angolan currency added
 2020-12-01 19:48:49 +01:00
Marcio Zebedeu
ea1393a7cb
New add VAT RAT for Angola 
VAT rate support for Angola was added.
 2020-12-01 19:29:11 +01:00
UT from dolibit
9d1da25f03
Update llx_const.sql 2020-12-01 13:57:33 +01:00
UT from dolibit
f847425f23
Update llx_accounting_abc.sql 2020-12-01 13:48:18 +01:00
Laurent Destailleur
d8bf7b2714 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
 2020-11-25 18:04:06 +01:00
Florian HENRY
e2b96a834d add SCOP and SCIC in ent form juridique 2020-11-25 12:11:00 +01:00
Jean-Sébastien Pédron
9b1dbf8d2a
llx_accounting_account_fr.sql: Remove left over field data 
In commit 86d9622360, the `pcg_subtype`
was removed from the inserted values.

In commit a85dfaf71e, values associated
with this field were removed. However, at least two lines in the
PCG99-BASE accounting accounts still had that field values.

This led to errors when importing the PCG99-BASE accounts. This patch
fixes the problem and the accounts can be imported successfully.
 2020-11-24 22:19:21 +01:00
UT from dolibit
1f8a8459fa
Update llx_c_currencies.sql 2020-11-13 11:25:58 +01:00
bahfir abbes
11099132da New: add notification on ACTION_CREATE event 2020-11-06 00:48:23 +01:00
Alexandre SPANGARO
61bca50fa6 NEW: Dictionary for availability - Add column position 2020-11-05 16:56:28 +01:00
Laurent Destailleur
c399721345 Update doc 2020-11-05 09:16:51 +01:00
Drosis Nikos
6ea9befb48
Add & Update tva for Greece 2020-10-16 15:20:12 +03:00
Florian HENRY
50a9bd368c review 2020-10-14 18:15:48 +02:00
Florian HENRY
77de8c242c commit add table 2020-10-14 12:24:35 +02:00
Alexandre SPANGARO
ca7ad35342 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-09 06:39:42 +02:00
Laurent Destailleur
1f8278c8ca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/core/class/html.formmail.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/other.lang
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-09-12 04:42:59 +02:00
Laurent Destailleur
05a2fc6186 Fix rate for tunisia 2020-09-10 19:40:03 +02:00
Noureddine LOUAHEDJ
8d7bbe3dcb NEW tva Algerie 2020-09-05 08:58:51 +01:00
Noureddine LOUAHEDJ
ebf718fdae NEW forme_juridique Algerie 2020-09-05 08:58:29 +01:00
Laurent Destailleur
7c39543c72 Support trigger in module recruitment 
Enhance generic code of automatic recording events
 2020-08-25 12:47:38 +02:00
Laurent Destailleur
b600478a5a Work on recruitment module 2020-08-23 22:11:16 +02:00
Laurent Destailleur
a265bec7ca NEW Events in agenda for contact 
FIX Saving contacts of an events
 2020-08-23 02:38:56 +02:00
Laurent Destailleur
ad0625b6ec Debug posting message from ticket page 2020-08-21 01:11:22 +02:00
Alexandre SPANGARO
27c36713d3 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-08-16 22:10:02 +02:00
Laurent Destailleur
d9818405c6 Fix regression for v13 2020-08-02 22:30:23 +02:00
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact 2020-07-31 16:41:17 +02:00
Laurent Destailleur
8d26329653 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/lib/price.lib.php
	htdocs/projet/activity/perday.php
 2020-07-19 02:24:26 +02:00
Laurent Destailleur
31cb57afc9 Fix regression with ecoterm 2020-07-18 23:27:43 +02:00
UT from dolibit
7184fba8c6
Update llx_c_incoterms.sql 
add column 'label' for short term description in english
add new Incoterm DPU  (DAT is obsolete , but let it stay for older documents)
 2020-07-14 13:59:16 +02:00
Alfredo Altamirano
6aae68bb07 Change Mexico City name 
Mexico City official name and code changed since 2016
 2020-07-11 10:49:05 -05:00
Laurent Destailleur
eede2f9944 Add telangana province for india 2020-07-11 10:39:12 +02:00
Alexandre SPANGARO
1855d54019 Fix data insertion 2020-07-06 04:31:32 +02:00
Alexandre SPANGARO
59ee22537d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-07-06 03:24:27 +02:00
Laurent Destailleur
83eaddb17b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/evalmath.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/install/mysql/migration/11.0.0-12.0.0.sql
	htdocs/langs/en_US/cashdesk.lang
	htdocs/societe/class/societe.class.php
 2020-07-04 13:13:17 +02:00
Laurent Destailleur
5afd518718 Update vat rate for Congo 2020-06-30 13:06:44 +02:00
Laurent Destailleur
6c2d70d43b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-17 19:27:39 +02:00
Laurent Destailleur
2f687a3c40 FIX #14033 2020-06-17 17:57:32 +02:00
Laurent Destailleur
c27eb5e623
Update llx_const.sql 2020-06-12 01:03:34 +02:00
Anthony Berton
00b9f8445f Add default const 2020-05-04 17:11:44 +02:00
kamel
9cb90cb384 NEW: Add prospect status managment for the contact with managment of custom icon 2020-04-27 17:35:14 +02:00
Laurent Destailleur
619014726e Fix char of account of us 2020-04-16 17:19:18 +02:00
Frederick Jost Zweig
49d5469904
Added basic charts of accounts for USA and Canada. 2020-04-15 13:29:51 +03:00
Laurent Destailleur
237615aa71 Fix offset for ecuador must be ID of country so 84 + 5 zeros 2020-04-03 02:35:55 +02:00
Fabian Palacios
ae4fb855d7 chart of accounts to Ecuador 2020-03-31 10:10:22 -05:00
Fabian Palacios
db18226493 Chart of accounts to Ecuador 2020-03-31 10:08:37 -05:00
Laurent Destailleur
42d417d5d5 Trans 2020-03-08 16:32:00 +01:00
Alexandre SPANGARO
98db5232d1 NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality 2020-02-27 14:05:30 +01:00
Alexandre SPANGARO
a85dfaf71e NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality 2020-02-27 12:09:19 +01:00
Alexandre SPANGARO
86d9622360 NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality 2020-02-27 10:44:04 +01:00
Laurent Destailleur
3792b8c8c8 Fix quote pb reported by travis CI 2020-02-10 15:34:57 +01:00
Laurent Destailleur
9aaed92b49 Fix quotes 2020-02-10 15:33:59 +01:00
Alexandre SPANGARO
45711bb43c typo 2020-02-10 05:39:49 +01:00
Alexandre SPANGARO
2f2a2aa52a NEW : Add French farm chart of accounts 2014 2020-02-10 05:35:16 +01:00
Laurent Destailleur
59e0ab9e04 Fix AT-BASE 2020-02-08 17:08:45 +01:00
Norbert Penel
c29a7527ad accounting austrian 2020-02-08 10:19:38 +01:00
Laurent Destailleur
cd58822d98 Can edit a table of resolution code for tickets 2020-02-07 12:48:41 +01:00
Alexandre SPANGARO
d6d3fff9dc Merge branch 'develop' into 10.0_intracommreport 2020-02-03 21:15:07 +01:00
Alexandre SPANGARO
f741c9cd42 NEW : Add French association chart of accounts 2018 2020-02-02 15:05:43 +01:00
Alexandre SPANGARO
91b4f7c663 Merge branch 'develop' into 12.0_a8 2020-02-02 14:44:50 +01:00
Alexandre SPANGARO
4c2c2461f9 NEW : Add French association chart of accounts 2018 2020-02-02 14:43:46 +01:00
Laurent Destailleur
f22ad9a9bf Add column eec in table of countries 2020-01-22 00:36:04 +01:00
Alexandre SPANGARO
282dc0177f NEW : Add French association chart of accounts 2018 2020-01-20 09:45:07 +01:00
Alexandre SPANGARO
5cf26ad9db Fix Belgian legal form 2020-01-16 04:31:35 +01:00
Alexandre SPANGARO
a198ca5c43
Merge branch 'develop' into 12.0_a1 2020-01-15 17:00:02 +01:00
Laurent Destailleur
68d7195964 MRP 2020-01-02 22:09:08 +01:00
Alexandre SPANGARO
c664a1e42d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2019-12-31 08:34:37 +01:00
Alexandre SPANGARO
6b55b600f1 Merge remote-tracking branch 'upstream/develop' into 12.0_a1 2019-12-23 21:31:52 +01:00
Laurent Destailleur
9a08a6bf6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/categories/traduction.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contact/card.php
	htdocs/core/modules/modSociete.class.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/langs/en_US/products.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
 2019-12-23 14:13:26 +01:00
Laurent Destailleur
d1fdd11b37 Close #10907 2019-12-19 11:32:10 +01:00
ptibogxiv
6789b7bd1e
Fix day scale unit 2019-12-18 18:23:31 +01:00
Laurent Destailleur
451b32674e Removed duplicate record 2019-12-18 12:15:34 +01:00
Alexandre SPANGARO
1a9c430e00 Add migration 2019-11-14 04:53:13 +01:00
Frédéric FRANCE
422d893ecc
Update llx_c_action_trigger.sql 2019-11-12 21:33:42 +01:00
Alexandre SPANGARO
812c032754 NEW French new regions 2019-11-12 15:56:11 +01:00
Laurent Destailleur
2c718af26c Missing container type 'menu' 
Fix: Add security if container is not a page
 2019-11-12 13:55:46 +01:00
Laurent Destailleur
3054177e79 Fix type of tickets 2019-11-10 12:28:30 +01:00
Laurent Destailleur
59d83fce59 Debug MRP module 2019-11-09 19:57:38 +01:00
Frédéric FRANCE
bbf962842e
add icons 2019-11-05 21:09:11 +01:00
Laurent Destailleur
b4d72e3e96 Fix link to setup of social network module 2019-11-05 10:00:46 +01:00
Frédéric FRANCE
1ba9612f12
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-27 17:03:50 +01:00
Laurent Destailleur
83a5cfbd1c Support events on BOM 2019-10-27 02:05:43 +02:00
Frédéric FRANCE
aca9d92db8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 22:03:33 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
03086026b8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-27 08:06:13 +02:00
Laurent Destailleur
72f9073337 Clean vat code samples to have cleaner rules for rowid. 2019-09-26 12:44:44 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
1584a4bf79 Add trigger event USER_SENTBYMAIL in agenda 2019-09-23 12:27:51 +02:00
Maxime Kohlhaas
48cbcdc757
Fix #11876 2019-09-15 17:08:21 +02:00
Frédéric FRANCE
230c14e189
add social networks 2019-09-12 22:32:41 +02:00
Laurent Destailleur
8381b93e80 Fix init of public holidays 2019-09-09 11:06:54 +02:00
Laurent Destailleur
15eaa5cbd8 NEW Public holidays are now in a table (no more hard coded per country) 2019-09-09 10:27:56 +02:00
Laurent Destailleur
47f72fb74c Update data file 2019-09-08 21:21:58 +02:00
Laurent Destailleur
37a32af7b0 NEW Add dictionary to store public holidays. 2019-09-05 20:19:13 +02:00
Laurent Destailleur
5ca988b3d2 Fix position of requests 2019-08-12 02:36:15 +02:00
Alexandre SPANGARO
8b8aaafc05 Merge branch 'develop' into 10.0_intracommreport 2019-07-20 05:47:31 +02:00
Laurent Destailleur
fafb7956de Fix position of triggers 2019-07-19 18:52:44 +02:00
Laurent Destailleur
e0095871aa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/stats/byratecountry.php
	htdocs/core/class/html.form.class.php
 2019-07-14 00:19:56 +02:00
Regis Houssin
332abd2a9f FIX __INFOS__ tag not exists 2019-07-13 11:02:45 +02:00
Alexandre SPANGARO
abfb708044 Merge branch 'develop' into 10.0_intracommreport 2019-06-19 21:43:40 +02:00
Laurent Destailleur
ae597e7b63
Merge pull request #11252 from KlaasOl/patch-2 
Create llx_accounting_account_nl.sql
 2019-05-29 12:25:42 +02:00
KlaasOl
4301cd5b7a
Update llx_accounting_abc.sql 
Adding chart of account NL VERKORT
 2019-05-26 15:40:44 +02:00
KlaasOl
f879225032
Create llx_accounting_account_nl.sql 
First accounting account scheme for Dutch accounting
 2019-05-26 15:29:50 +02:00
Alexandre SPANGARO
e81dcb6060 WIP Update database 2019-05-19 21:26:49 +02:00
ATM-Marc
2c104ccc4a NEW: contact types for supplier proposals 2019-05-18 14:22:04 +02:00
Laurent Destailleur
7a75567ad9 FIX Debug ticket module 2019-05-12 16:34:49 +02:00
ptibogxiv
7033243572
FIX url lettre max & colissimo 2019-05-05 15:02:00 +02:00
Laurent Destailleur
2eeb4b8734 Debug ticket module 2019-04-10 15:45:55 +02:00
Laurent Destailleur
1f6f6f6edb Track action close for ticket 2019-04-10 13:21:06 +02:00
liAnGjiA
62767fc059
Update llx_10_c_regions.sql 2019-03-25 10:16:41 +08:00
leangjia
a207a699b6 Add China regions. 2019-03-25 00:21:09 +08:00
Laurent Destailleur
1a8902f23e Fix migration for compatibility 2019-03-19 12:03:02 +01:00
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
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