Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 11:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
125,218 Commits 36 Branches 190 Tags
c263fccb5f8bedd828ef2fd34b64b51fb8812c06
Commit Graph

179 Commits

Author SHA1 Message Date
Laurent Destailleur
42329b10c9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/compta/facture/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/modulebuilder.lib.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
	htdocs/ticket/list.php
 2021-03-02 15:27:20 +01:00
Laurent Destailleur
0ac5e37066 Update date of ticket in demo 2021-03-01 19:41:51 +01:00
Frédéric FRANCE
1b046f25cf add new rule 2021-03-01 00:19:52 +01:00
Laurent Destailleur
f8ff8c63b6 Update init demo 2020-12-21 01:50:16 +01:00
Laurent Destailleur
eef218aa6b Fix message 2020-12-13 19:33:48 +01:00
Laurent Destailleur
6e465afb03 Remove data 2020-12-10 15:47:34 +01:00
Laurent Destailleur
59938147b6 Prepare v13 2020-12-10 13:38:12 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of 
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
 2020-10-25 16:01:18 +01:00
Laurent Destailleur
859fea626d Use more generic domain 2020-10-25 15:22:23 +01:00
Aurélien
140200213e change table into DB and ref #14697 2020-10-06 11:04:31 +02:00
Laurent Destailleur
380fe1acb7 Fix doc 2020-09-17 12:13:32 +02:00
Laurent Destailleur
8a10617c0c Update script 2020-09-17 12:12:49 +02:00
Laurent Destailleur
bdc30cc50b Update script 2020-09-17 12:10:54 +02:00
Laurent Destailleur
d41a813e0e Add script to reinit pass of the demo 2020-09-17 12:05:52 +02:00
Laurent Destailleur
bd65e5612f Fix duplicate id 2020-08-17 20:06:01 +02:00
Laurent Destailleur
4c0785e996 FIX #14469 2020-08-16 23:13:27 +02:00
Laurent Destailleur
b763b40d8c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-12 19:37:27 +02:00
Laurent Destailleur
2c327aae66 Prepare v12 2020-06-12 19:30:23 +02:00
Laurent Destailleur
8492272a08 Fix initdemo 2020-06-12 19:11:00 +02:00
Frédéric FRANCE
def53338de add new rule 2020-05-21 09:07:10 +02:00
Laurent Destailleur
5254a94038 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ldap.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/index.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/expedition/list.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/list.php
	htdocs/loan/list.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/list.php
 2020-04-16 15:58:59 +02:00
atm-quentin
5b96066bf4 FIX keep viewstatut for doli 3.5 2020-04-15 15:07:11 +02:00
atm-quentin
f7c07640dd viewstatut to search_status 2020-04-15 15:01:00 +02:00
Frédéric FRANCE
fc34b5a4cb compress png with zopflipng 2020-04-06 19:03:48 +02:00
Laurent Destailleur
e0d713bbef Update demo 2020-03-31 12:56:21 +02:00
Laurent Destailleur
2b725ad5d5 Update year in demo data 2020-03-30 14:57:56 +02:00
Laurent Destailleur
ead99c5976 Enhance updatedemo 2020-03-30 12:12:23 +02:00
Laurent Destailleur
6d732c9ea4 Update demo 2020-03-30 11:39:02 +02:00
Laurent Destailleur
faf289cd13 Update demo 2020-01-21 11:32:17 +01:00
Laurent Destailleur
c6d50ff786 Update demo sql file 2019-12-21 17:48:29 +01:00
Laurent Destailleur
599ca6cae2 Demo 2019-12-05 13:01:02 +01:00
Laurent Destailleur
25546f64b8 Update demo 2019-12-05 12:09:52 +01:00
Laurent Destailleur
fc2fc81bb0 Fix image 2019-12-01 18:22:08 +01:00
Laurent Destailleur
cb2bf00ef8 Add sql 2019-11-30 11:50:49 +01:00
Laurent Destailleur
268535a320 Update demo 2019-11-29 10:05:46 +01:00
Laurent Destailleur
3148f6a9fa Add file for demo v11 2019-11-28 16:44:05 +01:00
Laurent Destailleur
1636d341c7 Debug module BOM 
Enhance demo data for TakePOS
 2019-11-28 15:18:14 +01:00
Laurent Destailleur
aebae5ff83 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/margins.lang
	htdocs/user/class/user.class.php
 2019-10-10 10:37:17 +02:00
Laurent Destailleur
1c105718b9 Update demo 2019-10-08 21:06:09 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
f3bc319a78 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/takepos/takepos.php
 2019-09-27 14:11:14 +02:00
Laurent Destailleur
33754f1951 Update demo 2019-09-26 14:36:23 +02:00
Laurent Destailleur
24e5b6ab79 Fix default filename of dump 2019-09-26 14:35:50 +02:00
Laurent Destailleur
0e5d0a7784 Add data for tickets 2019-09-26 14:14:01 +02:00
Laurent Destailleur
b0615d477e Update demo 2019-09-26 13:58:43 +02:00
Laurent Destailleur
280219843e Update demo 2019-09-26 13:58:30 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Philippe GRAND
eef9b2867b all http addresses should be https now 2019-06-23 15:33:04 +02:00
Laurent Destailleur
1189abdef8 Clean demo file 2019-06-05 11:59:01 +02:00
Laurent Destailleur
8ef7a3abf2 Clean demofile for v10 2019-06-05 11:56:57 +02:00