Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,625 Commits 36 Branches 189 Tags
a4f44d61a88e787527b34a6d71fc3a2bc6af24d4
Commit Graph

581 Commits

Author SHA1 Message Date
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
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
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
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
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