Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
65,355 Commits 36 Branches 189 Tags
d8d54d246c5cc64cf0699efbf6aeef73b7d89dcd
Commit Graph

65355 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ATM-Nicolas
d8d54d246c FIX : Pagination on withdraw request list 2018-08-10 15:05:21 +02:00
Laurent Destailleur
de1386c83c Merge branch '7.0' of github.com:Dolibarr/dolibarr into 7.0 2018-08-08 16:49:09 +02:00
Juanjo Menent
e2499392a9 Merge pull request #9215 from fmarcet/7.0 
Fix: Bad position when document have incoterms/notes
 2018-08-08 11:10:47 +02:00
Juanjo Menent
b840152bcd Merge pull request #9217 from ATM-Nicolas/fix_undefined_index_notnull 
FIX : PHP warning, undefined index notnull
 2018-08-08 11:10:17 +02:00
Juanjo Menent
9f09c97eb9 Merge pull request #9198 from OPEN-DSI/fix_cmd_list 
FIX : Search on Ref project on order list
 2018-08-08 10:56:57 +02:00
Ferran Marcet
5ce31f65a4 Fix: Bad position when document have incoterms/notes 2018-08-07 11:40:11 +02:00
ATM-Nicolas
5b15e688af FIX : PHP warning, undefined index notnull 2018-08-07 09:38:18 +02:00
Philippe
61e1f0508d FIX : Search on Ref project on order list 2018-08-03 11:08:09 +02:00
Laurent Destailleur
6010d9de4b Merge pull request #9158 from atm-gauthier/7.0_missing_hook 
FIX : missing hook to edit sql
 2018-08-02 18:36:25 +02:00
Laurent Destailleur
17ed19503c Code comment 2018-08-02 17:51:04 +02:00
Laurent Destailleur
d84bacad00 Merge pull request #9196 from ATM-Nicolas/fix_wrong_variable_and_trigger_name 
FIX : Wrong variable and trigger name
 2018-08-02 17:43:16 +02:00
ATM-Nicolas
f3090e4819 FIX : Wrong variable and trigger name 2018-08-02 16:05:54 +02:00
Juanjo Menent
5b3c6de06c Merge pull request #9184 from atm-gauthier/7.0_fix_extrafieldkey 
FIX : extrafieldkey
 2018-08-02 11:24:19 +02:00
Juanjo Menent
1fbbaf2895 Merge pull request #9180 from atm-florian/7.0 
FIX: keep context filter on contact list on change column displayed
 2018-08-02 11:20:25 +02:00
Juanjo Menent
ce49230d71 Merge pull request #9177 from ATM-Nicolas/fix_preselect_project 
FIX : Keep same project when creating shipping from order
 2018-08-02 11:18:39 +02:00
Juanjo Menent
98dada47de Merge pull request #9174 from tarrsalah/fix-soc-filter-on-supplier-invoices 
FIX filter supplier invoice list by societe name.
 2018-08-02 11:12:01 +02:00
Juanjo Menent
2206eb98d1 Merge pull request #9191 from Dolibarr/revert-9147-7.0_price 
Revert "FIX multicompany compatibility !"
 2018-08-02 10:46:20 +02:00
Juanjo Menent
99f29a9764 Revert "FIX multicompany compatibility !" 2018-08-02 10:45:15 +02:00
Juanjo Menent
e6f416e745 Merge pull request #9147 from hregis/7.0_price 
FIX multicompany compatibility !
 2018-08-02 10:45:01 +02:00
gauthier
cadf931e8d FIX : extrafieldkey 2018-07-31 15:02:51 +02:00
florian HENRY
5d19361782 fix: keep context filter on contact list on change column displayed 2018-07-31 11:39:54 +02:00
ATM-Nicolas
1536bbc65e FIX : Keep same project when creating shipping from order 2018-07-30 15:16:53 +02:00
tarrsalah
8278a9fa52 FIX filter supplier invoice list by societe name. 2018-07-29 13:18:05 +01:00
Laurent Destailleur
894f484de8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-07-27 12:34:02 +02:00
Laurent Destailleur
83ae27d122 FIX Deletion of files in migration 2018-07-27 12:33:36 +02:00
gauthier
c95d6271a9 FIX : missing hook to edit sql 2018-07-25 11:15:13 +02:00
Laurent Destailleur
cfb0f2df05 Merge pull request #9149 from OPEN-DSI/fix_propal_list 
FIX search on ref project on propal list
 2018-07-24 21:42:02 +02:00
Philippe
d7f58d0087 FIX search on ref project on propal list 2018-07-24 20:28:49 +02:00
Laurent Destailleur
927727edf3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-07-24 19:22:12 +02:00
Laurent Destailleur
20f178fdfe Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/lib/functions.lib.php
 2018-07-24 19:22:00 +02:00
Regis Houssin
b7dfc99882 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_price 2018-07-24 18:58:23 +02:00
Laurent Destailleur
f50aa03187 Merge pull request #9112 from atm-gauthier/FIX_multientity_replenish 
FIX: stock replenish with multientity
 2018-07-24 18:10:00 +02:00
Laurent Destailleur
e9eb8da61b Update replenish.php 2018-07-24 18:09:50 +02:00
Laurent Destailleur
c7f54439ff Merge pull request #9145 from frederic34/patch-12 
use defaut currency for supplier order
 2018-07-24 17:32:11 +02:00
Regis Houssin
835cb04631 FIX remove rowid for multicompany compatibility 2018-07-24 17:07:08 +02:00
Frédéric FRANCE
bde30b85ad use defaut currency for supplier order 2018-07-24 17:06:12 +02:00
Laurent Destailleur
3bdf7d411d Merge pull request #9125 from atm-john/fix_php7_warning_mysql 
Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NU…
 2018-07-24 16:56:10 +02:00
Laurent Destailleur
8866b8eb1d Merge pull request #9133 from frederic34/patch-12 
__NEXT_MONTH __PREVIOUS_MONTH give day instead month
 2018-07-24 16:54:04 +02:00
Laurent Destailleur
e4705669ba Merge pull request #9136 from frederic34/patch-17 
remove % in supplier order pdf
 2018-07-24 16:51:58 +02:00
Regis Houssin
d4920521b5 FIX multicompany compatibility ! 2018-07-24 15:44:21 +02:00
Frédéric FRANCE
4341e367d2 remove % in supplier order pdf 2018-07-23 10:30:28 +02:00
Frédéric FRANCE
d582f72bd9 __NEXT_MONTH __PREVIOUS_MONTH give day instead month 2018-07-22 17:27:02 +02:00
Laurent Destailleur
a1180f79bd Fix missing customer code and ref customer 2018-07-21 12:56:18 +02:00
John BOTELLA
1e986bc39a Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NUM' (this will throw an Error in a future version of PHP) 2018-07-20 11:51:01 +02:00
Laurent Destailleur
7fcec5f6c3 Fix duplicate tab "contact" on thirdparty 2018-07-17 13:54:13 +02:00
Laurent Destailleur
45a45b0dec NEW Can enable a module, even external module, from command line 
Conflicts:
	htdocs/install/upgrade2.php
 2018-07-16 15:35:00 +02:00
gauthier
33aa373362 FIX: when stock is empty for current entity but > 0 in other entity, until this commit product wasn't displaied on replenishment, it must depends on multientity stock sharing 2018-07-16 15:27:37 +02:00
Laurent Destailleur
e92052353d Merge pull request #9026 from inoveaconseil/FixExtrafieldResource 
Fix extrafields resource
 2018-07-15 20:13:24 +02:00
Laurent Destailleur
b690306b70 Merge pull request #9027 from hregis/7.0_price 
Fix: avoid a non numeric value !!
 2018-07-15 20:11:50 +02:00
Laurent Destailleur
cb0553c3bf Merge pull request #9094 from atm-ph/fix_7.0_getrights 
Fix user rights overrided by user group rights
 2018-07-15 19:58:00 +02:00