Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-01 05:43:24 +01:00
Code Issues Packages Projects Releases Wiki Activity
67,719 Commits 38 Branches 191 Tags
67a831ad5feafe8023957cd9cc70f32f6b8564bd
Commit Graph

59062 Commits

Author SHA1 Message Date
Laurent Destailleur
67a831ad5f Merge pull request #9045 from hregis/8.0_multicompany 
Fix: check if multicompany object exists
 2018-07-06 14:23:59 +02:00
Laurent Destailleur
05ed721a8c Fix name of constant for module TICKET 2018-07-06 13:09:07 +02:00
Laurent Destailleur
e61f0ef7e4 Merge pull request #9060 from atm-maxime/fix_mod_ticket 
Fix mod ticket
 2018-07-06 13:05:42 +02:00
Laurent Destailleur
6c5264fabb Fix label 2018-07-06 12:45:20 +02:00
Laurent Destailleur
af3ab84ebb Fix backward compatibility with old multicompany module 2018-07-05 22:15:55 +02:00
Laurent Destailleur
b369585e61 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/product/stats/commande.php
	htdocs/product/stats/commande_fournisseur.php
	htdocs/product/stats/contrat.php
	htdocs/product/stats/facture.php
	htdocs/product/stats/facture_fournisseur.php
	htdocs/product/stats/propal.php
	htdocs/product/stats/supplier_proposal.php
 2018-07-05 15:57:27 +02:00
Laurent Destailleur
0587e73272 FIX Pagination on related item pages 2018-07-05 15:53:28 +02:00
Maxime Kohlhaas
badcbd78d8 Rename ticketsup public directory 2018-07-05 15:20:38 +02:00
Maxime Kohlhaas
39f890d84a Fix TICKETSUP var name 2018-07-05 14:51:00 +02:00
Maxime Kohlhaas
74b9f87cab Fix ticket : missing file for numbering 2018-07-05 14:35:12 +02:00
Laurent Destailleur
5883899bc7 Little debug of option WEBSITE_USE_WEBSITE_ACCOUNTS 2018-07-05 02:33:39 +02:00
Laurent Destailleur
9842978b85 Fix trim config values 2018-07-04 11:16:45 +02:00
Laurent Destailleur
64e778a78f Fix pgsql migration 2018-07-04 10:26:25 +02:00
Laurent Destailleur
d4d9a8d75a Fix 8.0 not 9.0 2018-07-03 20:13:30 +02:00
Laurent Destailleur
38cd5180d9 FIX for migration from old versions 2018-07-03 20:11:59 +02:00
Laurent Destailleur
50df452b9e Fix status "Supplier" not always visible. 2018-07-03 17:37:23 +02:00
Regis Houssin
0bb7f84f87 Fix: check if multicompany object exists 2018-07-03 14:11:00 +02:00
Laurent Destailleur
f93f5bd6e0 Fix travis 2018-07-03 13:49:41 +02:00
Laurent Destailleur
da7b433cd0 Trans 2018-07-03 12:46:22 +02:00
Laurent Destailleur
cfb41d4329 FIX: If module workflow disabled, we must disable autoclassification too 2018-07-03 11:43:50 +02:00
Laurent Destailleur
7ef6b16d31 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/install/step1.php
 2018-07-03 10:04:25 +02:00
Laurent Destailleur
0138b0e0b7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-07-03 10:01:30 +02:00
Laurent Destailleur
01e8f78c30 Trans 2018-07-03 09:58:36 +02:00
Laurent Destailleur
c2499f298c Fix bad name of field 2018-07-02 18:08:55 +02:00
Laurent Destailleur
0f77e3c05c Fix bad name of field 2018-07-02 17:57:32 +02:00
Laurent Destailleur
3c176adb38 Fix more complete fix for bad label in creating invoice from other obj 2018-07-02 16:46:30 +02:00
Laurent Destailleur
cae7cabe6d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-07-02 16:22:55 +02:00
Laurent Destailleur
b22754c60b FIX label of source object 2018-07-02 16:22:40 +02:00
Laurent Destailleur
4e7f9b1b4d Merge pull request #9038 from hregis/8.0_multicompany 
Fix: possibility to overload permissions (multicompany sharing)
 2018-07-02 16:12:40 +02:00
Laurent Destailleur
5138a09db3 Fix sql of time spent per day 2018-07-02 15:54:21 +02:00
Laurent Destailleur
7c5aa148d9 Fix fetch 2018-07-02 15:26:01 +02:00
Laurent Destailleur
9c5d34fc5f Fix translation 2018-07-02 12:26:32 +02:00
Laurent Destailleur
a2c89d8110 Fix page code in pdf 2018-07-02 12:25:09 +02:00
Laurent Destailleur
7bf33b1bac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/hrm/index.php
	htdocs/install/mysql/tables/llx_website_account.key.sql
	htdocs/modulebuilder/template/myobject_card.php
 2018-07-02 12:16:51 +02:00
Laurent Destailleur
af21222c30 Fix translation 2018-07-02 11:47:04 +02:00
Laurent Destailleur
e8b97b0be4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-07-02 11:33:49 +02:00
Laurent Destailleur
11021353da Fix text in payment area of crabe pdf 2018-07-02 11:33:33 +02:00
Regis Houssin
9709207a4f Fix: superadmin can show all users in master entity 2018-07-02 10:18:16 +02:00
Regis Houssin
df718cca5c Fix: better sql request with multicompany transverse mode 2018-07-02 10:09:56 +02:00
Regis Houssin
233ad2945c Fix: missing hook parameter 2018-07-01 20:03:08 +02:00
Regis Houssin
26495fb698 Fix: !!!! Dont't use entity if you use rowid in fetch or others !!!! 2018-07-01 18:49:37 +02:00
Regis Houssin
f13dd9c9bd Fix: missing hook parameter 2018-07-01 18:22:18 +02:00
Regis Houssin
8f124efc15 Fix: wrong mysql resource name 2018-07-01 17:48:01 +02:00
Regis Houssin
05c666c18b Fix: use numbering model corresponding to the entity of the object 2018-07-01 17:06:19 +02:00
Regis Houssin
80adac12c0 Fix: use object entity ID instead current entity 2018-07-01 16:01:30 +02:00
Regis Houssin
df55bee8ae Fix: missing "$disableremove" global 2018-07-01 15:33:10 +02:00
Regis Houssin
c0c8a70dd5 Fix: permissions 2018-07-01 12:21:51 +02:00
Regis Houssin
d699667722 Fix: possibility to overload permissions (multicompany sharing) 2018-07-01 11:06:47 +02:00
Laurent Destailleur
16b4d2aee7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-06-30 02:04:24 +02:00
Laurent Destailleur
400d400b32 Fix bad constructor 2018-06-30 01:59:54 +02:00