atm-greg
|
fc705e8510
|
Merge branch '8.0' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
|
2018-08-07 09:31:41 +02:00 |
|
atm-greg
|
c1de7fe8ac
|
fix update_buyprice
|
2018-08-07 09:15:30 +02:00 |
|
atm-greg
|
08273612d9
|
create field without migration
|
2018-08-06 17:21:20 +02:00 |
|
atm-greg
|
7063850034
|
add sql field
|
2018-08-06 16:32:25 +02:00 |
|
atm-greg
|
a8b33a1710
|
New fields desc_supplier on product_fourn_prices
|
2018-08-06 16:26:25 +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
|
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 |
|
Regis Houssin
|
e1877625a0
|
FIX clean code
|
2018-07-27 13:42:44 +02:00 |
|
Laurent Destailleur
|
8ab03c469a
|
Fix migration
|
2018-07-27 13:42:32 +02:00 |
|
Laurent Destailleur
|
7af42c66cc
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/comm/propal/list.php
|
2018-07-27 12:54:45 +02: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
|
7821e21e5b
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-07-24 19:23:51 +02:00 |
|
Laurent Destailleur
|
d871b8964f
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-07-24 19:23:40 +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 |
|
Laurent Destailleur
|
f672e8bf02
|
Fix trans
|
2018-07-24 19:12:35 +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
|
77c121b15c
|
Merge pull request #9099 from ATM-Nicolas/7.0
NEW Set contactCivName substitution key
|
2018-07-24 18:02:21 +02:00 |
|
Laurent Destailleur
|
ece655a84a
|
Merge pull request #9128 from atm-john/fix_situation_invoice_status
Fix situation invoice status
|
2018-07-24 17:49:53 +02:00 |
|
Laurent Destailleur
|
869a97c8d1
|
Update card.php
|
2018-07-24 17:49:10 +02:00 |
|
Laurent Destailleur
|
a469f841f7
|
Merge pull request #9140 from bugness-chl/8.0-bugfix-pdf
FIX 2 bugfix for PDF generated by Templates/Cron: DueDate and translation
|
2018-07-24 17:47:37 +02:00 |
|
Laurent Destailleur
|
bb9c53b41f
|
Merge pull request #9118 from bugness-chl/8.0
corr. "group by" for PostgreSQL
|
2018-07-24 17:43:36 +02:00 |
|
Laurent Destailleur
|
08a5b499fe
|
Merge pull request #9139 from bugness-chl/8.0-translation
Translation: adding 'Enable' term in main
|
2018-07-24 17:41:53 +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 |
|
Laurent Destailleur
|
71deb9ea60
|
Merge pull request #9143 from hregis/8.0_dict
FIX field is autoincrement but not "rowid"
|
2018-07-24 17:22:53 +02:00 |
|
Laurent Destailleur
|
68ad5d780c
|
Merge pull request #9142 from hregis/8.0_pg
FIX missing drop old postgresql unique key
|
2018-07-24 17:16:55 +02:00 |
|
Laurent Destailleur
|
438cdfc004
|
FIX #9141
|
2018-07-24 17:16:21 +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
|
a65c4ebecd
|
Merge pull request #9130 from hregis/8.0_bug
FIX disable/enable foreign key checking for avoid errors
|
2018-07-24 16:55:37 +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 |
|