Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-02 23:22:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
65,684 Commits 37 Branches 191 Tags
66ea8bbe87ebe6763b7a660cfdcda8ef1dd22eea
Commit Graph

57142 Commits

Author SHA1 Message Date
gauthier
66ea8bbe87 FIX : fourn payment modes musn't be available on customer docs 2018-11-12 15:58:41 +01:00
tarrsalah
5eb897e049 FIX sql query performance on list_qualified_avoir_supplier_invoices. 2018-11-12 12:11:40 +01:00
Laurent Destailleur
400b48bd9b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-08 20:14:59 +01:00
Laurent Destailleur
9012f6ecc5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-08 20:14:40 +01:00
Laurent Destailleur
f919e6ddb0 Merge pull request #9971 from atm-gauthier/FIX_langs_projet 
FIX : OppStatusShort doesn't exists
 2018-11-08 20:00:49 +01:00
Laurent Destailleur
e84e7f02c8 Merge pull request #9963 from atm-john/fix_marge_sign 
FIX marge sign
 2018-11-08 19:37:52 +01:00
Laurent Destailleur
78778e4c58 Merge pull request #9948 from frederic34/patch-9 
FIX mode is only customer in stats fichinter
 2018-11-08 19:16:00 +01:00
Laurent Destailleur
e92a63ba73 FIX If we change customer/supplier rule we can't edit old thirdparty. 2018-11-08 17:15:35 +01:00
Frédéric FRANCE
8bb1545ed0 Update index.php 2018-11-08 12:16:05 +01:00
Frédéric FRANCE
670eed1e68 Update index.php 2018-11-08 12:13:07 +01:00
gauthier
70826c3191 FIX : same on lines 2018-11-07 16:32:23 +01:00
gauthier
05a679a10c FIX : OppStatusShort doesn't exists 2018-11-07 16:26:25 +01:00
John BOTELLA
9d780a1722 Fix sign 2018-11-07 10:11:29 +01:00
Laurent Destailleur
56a70ab4e5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-05 10:23:15 +01:00
Laurent Destailleur
693cf72fca Merge pull request #9920 from ATM-Marc/FIX_6.0_task_activity_access 
FIX: task time screen: bad task assignments
 2018-11-05 10:21:28 +01:00
Laurent Destailleur
e1e0001fda Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-05 09:56:00 +01:00
Laurent Destailleur
8b373fb7a3 Merge pull request #9935 from atm-maxime/fix_socdelete_unlink_parent 
Fix parent link was not removed on societe deletion #9106
 2018-11-05 09:35:41 +01:00
Laurent Destailleur
98a3af620b FIX #9934 2018-11-05 09:26:23 +01:00
Frédéric FRANCE
d6b909a280 Update index.php 2018-11-03 18:26:11 +01:00
Frédéric FRANCE
8ab53012b7 mode is only customer in stats fichinter 2018-11-03 18:20:36 +01:00
Maxime Kohlhaas
29c0448a2e Fix parent link was not removed on societe deletion #9106 2018-11-01 15:41:58 +01:00
Maxime Kohlhaas
d1133916e0 Fix tracking field in dictionnary should not be mandatory 2018-11-01 15:33:14 +01:00
Laurent Destailleur
4b402aa6d1 Fix regression on name of array 2018-10-31 15:41:00 +01:00
Laurent Destailleur
07719eaf1e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-31 15:31:44 +01:00
Laurent Destailleur
ca726e6c94 FIX Error generating ODT when option to use contact on doc on 2018-10-31 15:31:22 +01:00
Laurent Destailleur
064417dcf1 Merge pull request #9889 from atm-maxime/fix_invoice_from_contract2 
Fix invoice creation from contract was invoicing closed services #9087
 2018-10-30 21:13:38 +01:00
Marc de Lima Lucio
2fbc305683 FIX: task time screen: last fix was overkill 2018-10-30 16:00:56 +01:00
Laurent Destailleur
68804cf8a5 Merge pull request #9890 from atm-maxime/fix_import_societe_alias 
FIX missing name alias field in societe import/export #9091
 2018-10-30 15:00:34 +01:00
Laurent Destailleur
b0ef8680ff Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-30 14:28:25 +01:00
Marc de Lima Lucio
8911d72be8 FIX: task time screen: prevent users with access to all project from assigning to tasks they're not allowed to do 2018-10-30 12:28:04 +01:00
Frédéric FRANCE
a30091fd74 Update commande.class.php 2018-10-27 09:51:19 +02:00
Maxime Kohlhaas
abb343d37e Fix missing name alias field in societe import/export #9091 2018-10-27 09:42:08 +02:00
Maxime Kohlhaas
1b054f1b36 Fix invoice creation from contract was invoicing closed services #9087 2018-10-27 09:21:49 +02:00
Marc de Lima Lucio
16c35035c1 FIX: pdf typhon: order reference duplicate 2018-10-25 12:07:40 +02:00
gauthier
036f70860e FIX : wrong occurence number of contract on contact card, we must only count externals 2018-10-24 10:17:21 +02:00
Laurent Destailleur
919c4fc5bc Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/theme/md/style.css.php
 2018-10-24 02:40:57 +02:00
Laurent Destailleur
4060dd5377 Merge pull request #9826 from frederic34/patch-9 
Update ajax.lib.php
 2018-10-24 02:29:20 +02:00
Laurent Destailleur
52364f0fd9 Merge pull request #9834 from frederic34/patch-19 
missing semicolon in MD style css
 2018-10-24 02:29:02 +02:00
Laurent Destailleur
2ba6f96765 Update style.css.php 2018-10-24 02:27:59 +02:00
Laurent Destailleur
ddd267f4c3 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-24 02:21:53 +02:00
ATM-Nicolas
cf28e4e442 FIX : Variable name 2018-10-22 15:19:33 +02:00
Frédéric FRANCE
83e2951107 Update style.css.php 2018-10-21 09:59:14 +02:00
Frédéric FRANCE
28c86a613d Update style.css.php 2018-10-21 09:39:07 +02:00
Frédéric FRANCE
c4029f5e5f Update style.css.php 2018-10-21 09:23:33 +02:00
Frédéric FRANCE
f322c73dd7 Update ajax.lib.php 2018-10-19 22:52:18 +02:00
Laurent Destailleur
57ad200ae5 Fix regression in creating discount 2018-10-19 14:43:10 +02:00
Laurent Destailleur
47abbd3eb2 Fix bad merge 2018-10-19 14:23:36 +02:00
Laurent Destailleur
36ae81c749 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-19 14:17:20 +02:00
Laurent Destailleur
de4ead2558 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/accountancy/class/accountancycategory.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/product/reassort.php
 2018-10-19 14:16:53 +02:00
gauthier
aea7299970 FIX : use discount with multicurrency 2018-10-17 15:49:08 +02:00