Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
76,533 Commits 36 Branches 190 Tags
d6b6f77e74beeab3cb41cbdbbd59b255e4c0614c
Commit Graph

4795 Commits

Author SHA1 Message Date
Laurent Destailleur
13abfc3140 Code comment 2019-06-18 16:46:12 +02:00
Laurent Destailleur
1dc247705d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/expensereport/list.php
	htdocs/holiday/list.php
 2019-06-18 16:11:16 +02:00
Laurent Destailleur
ae00743590 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-18 16:04:48 +02:00
Laurent Destailleur
6afda6a47a FIX invalid link on user.fk_user 2019-06-18 15:57:22 +02:00
Laurent Destailleur
8835b49f3f Debug the accounting-file tool 2019-06-18 14:30:13 +02:00
Laurent Destailleur
4f03d4f642 Merge branch '10.0' into patch-189 2019-06-16 17:26:41 +02:00
Laurent Destailleur
badfd47ee7 Fix migration 2019-06-16 17:25:42 +02:00
ptibogxiv
d838ced12e Update 9.0.0-10.0.0.sql 2019-06-14 18:41:38 +02:00
ptibogxiv
cd5c2c3249 Update llx_bom_bom.sql 2019-06-14 18:39:05 +02:00
Laurent Destailleur
f41606ba15 Merge branch '10.0' into 10.0_Differentiated_export 2019-06-12 13:27:49 +02:00
Laurent Destailleur
73326cfbf9 Removed bad commited files 2019-06-07 16:56:08 +02:00
Laurent Destailleur
8ef7a3abf2 Clean demofile for v10 2019-06-05 11:56:57 +02:00
Laurent Destailleur
d3d0ce4649 Better error message when missing grant privileges 2019-06-05 10:42:59 +02:00
Laurent Destailleur
a70a14b145 Fix migration 2019-06-04 20:06:44 +02:00
Laurent Destailleur
21a1e0d7b3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/categories/index.php
	htdocs/comm/action/list.php
	htdocs/comm/action/rapport/index.php
	htdocs/compta/paiement.php
	htdocs/compta/sociales/document.php
	htdocs/compta/tva/document.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/facture/paiement.php
	htdocs/loan/document.php
	htdocs/main.inc.php
 2019-06-04 19:03:27 +02:00
Laurent Destailleur
664e0b81d8 Debug module BOM 2019-06-03 22:07:34 +02:00
Laurent Destailleur
3cda0d2dc5 Fix phpcs 2019-06-02 15:49:10 +02:00
Laurent Destailleur
57cfb4b007 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/class/website.class.php
 2019-06-02 12:36:07 +02:00
Laurent Destailleur
300f46cb01 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-02 12:30:25 +02:00
Laurent Destailleur
ea58f8a617 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-02 11:49:49 +02:00
Laurent Destailleur
5f0fbcea9a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/contact/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
 2019-06-02 11:49:33 +02:00
Maxime Kohlhaas
15fd24a511 Fix : remove hardcoded llx_ prefix 2019-05-31 12:14:51 +02:00
Regis Houssin
063fe35c97 FIX missing encrypt llx_const fields 2019-05-30 11:45:55 +02:00
Regis Houssin
bdd54ae245 FIX missing llx_const encrypt 2019-05-30 11:42:28 +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
Laurent Destailleur
8c97fc164f Merge pull request #11253 from KlaasOl/patch-3 
Update llx_accounting_abc.sql
 2019-05-29 12:25:08 +02:00
Laurent Destailleur
05063016e8 FIX #11244 Enhance repair tool 2019-05-29 12:21:51 +02:00
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +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
Laurent Destailleur
b7a3cdd7c6 Debug BOM module 2019-05-26 01:31:54 +02:00
Laurent Destailleur
9f9f3bda63 Debug BOM module 2019-05-26 01:06:19 +02:00
Laurent Destailleur
a5865d3e4a Debug BOM 2019-05-25 19:29:33 +02:00
Alexandre SPANGARO
d9e9cb2ea9 Merge branch 'develop' into 10.0_Differentiated_export 2019-05-20 15:02:05 +02:00
florian HENRY
c3dbbe51cf fix missing migration sql for ticket now stable on 10 2019-05-18 23:57:00 +02:00
Laurent Destailleur
a1ec074d03 Merge pull request #11205 from ATM-Marc/NEW_supplier_proposal_contact_type 
FIX: add contact types for supplier proposals (Issue #10949)
 2019-05-18 16:56:40 +02:00
ATM-Marc
2c104ccc4a NEW: contact types for supplier proposals 2019-05-18 14:22:04 +02:00
Laurent Destailleur
9e38f3122d Update for pgsql 2019-05-18 01:26:44 +02:00
Norbert Penel / OSCSS
13b75e35a0 FIx tms field made with modulebuilder 
all new module appear to have a bug on tms, no data can be inserted due to tms default value that can't be null
 2019-05-18 00:20:44 +02:00
Laurent Destailleur
bd1ed4f7ac Merge branch 'develop' into 10.0_Differentiated_export 2019-05-16 21:26:20 +02:00
Laurent Destailleur
0d6841dacb Merge pull request #11176 from aspangaro/10.0_FEC 
FIX FEC Remove useless field 'validated'
 2019-05-16 21:20:20 +02:00
Alexandre SPANGARO
60d00e2f5c FIX FEC Remove useless field 'validated' 2019-05-14 06:46:06 +02:00
Alexandre SPANGARO
7c9ccee64d NEW Accountancy - Differentiated export 2019-05-14 05:45:36 +02:00
Laurent Destailleur
7a75567ad9 FIX Debug ticket module 2019-05-12 16:34:49 +02:00
Laurent Destailleur
cdebca14a7 Fix migration 2019-05-09 17:32:13 +02:00
Laurent Destailleur
1c558c685c Fix class not found 2019-05-09 17:16:35 +02:00
ptibogxiv
f0fd0ece60 Update 9.0.0-10.0.0.sql 2019-05-05 15:06:10 +02:00
ptibogxiv
7033243572 FIX url lettre max & colissimo 2019-05-05 15:02:00 +02:00
Laurent Destailleur
3a8d645fb9 Debug module ticket 2019-05-01 20:55:46 +02:00
Laurent Destailleur
10dde837d0 Debug email collector 2019-04-25 19:32:48 +02:00