Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 11:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
83,302 Commits 36 Branches 190 Tags
f6f9ca48dd9b6d76aadeca33021c8ab30a7cd020
Commit Graph

5178 Commits

Author SHA1 Message Date
Laurent Destailleur
11e9cc68b7 Merge pull request #13666 from frederic34/patch-1 
Rename llx_c_shipment_package_type to llx_c_shipment_package_type.sql
 2020-04-22 00:37:19 +02:00
Laurent Destailleur
f670a68b04 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/mails.php
 2020-04-21 18:29:50 +02:00
Laurent Destailleur
f6735ce8f2 Update repair.sql script 2020-04-21 14:28:52 +02:00
Frédéric FRANCE
f09fa5226a Rename llx_c_shipment_package_type to llx_c_shipment_package_type.sql 2020-04-20 18:43:05 +02:00
Laurent Destailleur
3408f67348 Clean orhpelins in llx_product_association 2020-04-02 16:00:09 +02:00
Laurent Destailleur
6f0071bebe FIX sort on company on member list 2020-03-31 17:54:48 +02:00
Laurent Destailleur
1e955a89ef FIX #13399 after #13285 and #13183 2020-03-23 15:28:18 +01:00
Laurent Destailleur
fff7ee3e96 FIX #13285 SQL error during migration with pgsql 2020-03-06 01:55:36 +01:00
Laurent Destailleur
4b4d1bcce2 Fix disable accountancy chart that is deprecated. 2020-02-24 03:05:58 +01:00
Laurent Destailleur
090b0e90d2 FIX #13183 2020-02-23 23:52:48 +01:00
Laurent Destailleur
69a0a1410e FIX #12991 2020-02-03 02:28:23 +01:00
Laurent Destailleur
a0e3c5292f FIX #12992 2020-02-03 02:20:38 +01:00
Laurent Destailleur
0a221f66ea Update template 2020-01-29 20:38:46 +01:00
Laurent Destailleur
24eb584d50 Doc 2020-01-28 11:04:41 +01:00
Laurent Destailleur
6744fc4279 Fix takepos permissions 2020-01-27 00:38:28 +01:00
Laurent Destailleur
cfc74db5bc FIX field 'private' on email templates was not managed. 2020-01-20 18:38:53 +01:00
Laurent Destailleur
60fd1f5156 Fix bad entry in menu 2020-01-20 12:47:49 +01:00
Laurent Destailleur
206cfcd7fe Clean code for inventory 2020-01-20 02:07:47 +01:00
Laurent Destailleur
e803e06c0d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/card.php
	htdocs/exports/export.php
 2020-01-19 19:01:46 +01:00
Laurent Destailleur
00cddc39fd Fix remove some orphelins in llx_ecm_files 2020-01-19 13:56:16 +01:00
Laurent Destailleur
b48c9a5998 Update website templates 2020-01-17 14:09:29 +01:00
atm-ph
a088c78279 Fix column type to be as llx_facture 2020-01-15 09:52:12 +01:00
Laurent Destailleur
d0739af8b4 Debug MRP 2020-01-08 19:04:00 +01:00
Laurent Destailleur
2eb2feff04 More complete repair 2020-01-08 14:16:05 +01:00
Laurent Destailleur
20c9035837 Debug MRP 2020-01-07 22:17:40 +01:00
Laurent Destailleur
68d7195964 MRP 2020-01-02 22:09:08 +01:00
Laurent Destailleur
d93de4b931 FIX Import of customer prices per segment was not possible 2020-01-02 20:08:43 +01:00
Laurent Destailleur
2ac6a8a3db Fix ping after update 2020-01-01 14:30:16 +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
eb32e98127 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-23 14:01:44 +01:00
Laurent Destailleur
36e6036e9e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-12-23 14:01:00 +01:00
Laurent Destailleur
22f3b69666 Fix default value for situation invoice 2019-12-22 11:59:38 +01:00
Laurent Destailleur
e2451bcd26 Update images 
Fix value of delay for warning on project not closed
 2019-12-21 17:11:21 +01:00
Laurent Destailleur
c0ef3b46ad Work on MRP module 2019-12-20 15:31:05 +01:00
Laurent Destailleur
7e526f4f41 Fix repair.php removed tabs when it should not 2019-12-19 12:28:50 +01:00
Laurent Destailleur
fb02582de0 Fix clean of constant _TABS_ was forgotten 2019-12-19 12:06:31 +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
Laurent Destailleur
4a734e53a6 Fix column too low. 
Fix automatic event not found if from a module with several objects
 2019-12-17 14:47:58 +01:00
Francis Appels
95b56f0518 Update 6.0.0-7.0.0.sql 
timestamp NOT NULL can cause SQL error.
 2019-12-17 12:19:35 +01:00
Laurent Destailleur
cb71d5a7bb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-15 17:18:21 +01:00
Laurent Destailleur
0ef3de98c6 Try to fix conflict of several stripe accounts 2019-12-15 17:18:09 +01:00
Laurent Destailleur
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
 2019-12-14 14:53:49 +01:00
Laurent Destailleur
7d39554797 FIX Bad type of sql fields 2019-12-13 17:16:21 +01:00
Laurent Destailleur
df7a86dd42 Merge pull request #12652 from frederic34/doxygen_societe 
doxygen societe class
 2019-12-09 13:02:49 +01:00
Laurent Destailleur
2b5866aca2 WIP Complete module MRP 2019-12-08 23:45:06 +01:00
Frédéric FRANCE
48564ea760 doxygen societe class 2019-12-08 14:26:59 +01:00
Laurent Destailleur
3030a9fa2a Fix manifest file was saved but not enabled. 2019-12-07 13:09:55 +01:00
Laurent Destailleur
18464de297 Clean old file 2019-12-04 22:08:32 +01:00