Commit Graph

59676 Commits

Author SHA1 Message Date
Laurent Destailleur
e106fda5e6
Merge pull request #9113 from torvista/export-import
Fix for Warning: A non-numeric value encountered in bank.lib.php on line 359
2018-08-02 18:38:46 +02:00
Laurent Destailleur
0e3473701a
Update bank.lib.php 2018-08-02 18:38:33 +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
51effef629 Reset pagination when current page too high 2018-08-02 18:22:08 +02:00
Laurent Destailleur
17ed19503c Code comment 2018-08-02 17:51:04 +02:00
Laurent Destailleur
12fdbcce59 Fix trigger name 2018-08-02 17:49:05 +02:00
Laurent Destailleur
e85ec19018
Merge pull request #9093 from atm-gauthier/FIX_filters
FIX : page must always be 0 when we search
2018-08-02 17:48:35 +02:00
Laurent Destailleur
b5a0e14ffe
Merge pull request #9185 from atm-john/fix_situation_total_calcul
Important: fix situation line's total
2018-08-02 17:45:44 +02:00
ATM-Nicolas
f3090e4819 FIX : Wrong variable and trigger name 2018-08-02 16:05:54 +02:00
Philippe GRAND
ccabd2b859 Uniformize 2018-08-02 14:03:50 +02:00
Juanjo Menent
94ffda8862
Merge pull request #9188 from ptibogxiv/patch-30
update to Stripe Requirements and Best Practices
2018-08-02 11:37:49 +02:00
Juanjo Menent
b8efe3b239
Merge pull request #9172 from grandoc/new_branch_28_07_2018
standardize
2018-08-02 11:27:02 +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
788060aa28
Merge pull request #9178 from aspangaro/9.0_a3
NEW : Add project on salaries
2018-08-02 11:19:34 +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
37a9a2df56
Merge pull request #9167 from frederic34/include
Include and co are statements
2018-08-02 11:03:44 +02:00
Juanjo Menent
03963dfe8a
Merge pull request #9163 from frederic34/nolink
fix no link in order list
2018-08-02 11:02:39 +02:00
Juanjo Menent
79a13403ae
Merge pull request #9162 from frederic34/extratotalize
NEW: Extrafield totalizable
2018-08-02 10:59:46 +02:00
Juanjo Menent
738caa605f
Merge pull request #9160 from hregis/develop_api
FIX compatibility with multicompany transverse mode
2018-08-02 10:57:27 +02:00
Juanjo Menent
e86a970332
Merge pull request #9156 from frederic34/patch-20
Update list.php
2018-08-02 10:56:01 +02:00
Juanjo Menent
f93519bc2e
Merge pull request #9155 from frederic34/patch-19
Update element_resource.php
2018-08-02 10:54:30 +02:00
Juanjo Menent
929d8fa66e
Merge pull request #9153 from frederic34/patch-17
Update payment.php
2018-08-02 10:52:07 +02:00
Juanjo Menent
ca717a7ce1
Merge pull request #9152 from frederic34/patch-12
Update card-rec.php
2018-08-02 10:50:50 +02:00
Juanjo Menent
82bdbd6f6e
Merge pull request #9151 from frederic34/patch-11
Update card.php
2018-08-02 10:50:05 +02:00
ptibogxiv
40b19b8e1d
update to Stripe Requirements and Best Practices
cf https://stripe.com/docs/partners/requirements
2018-08-01 11:50:43 +02:00
ptibogxiv
d50a95c89b
update to straipe
cf https://stripe.com/docs/building-plugins#setappinfo
2018-08-01 11:40:12 +02:00
Alexandre SPANGARO
ee61a88540 Small fix 2018-08-01 07:46:17 +02:00
florian HENRY
ceb85cfa45 fix : odt project and task extrafields management 2018-07-31 17:29:08 +02:00
gauthier
cadf931e8d FIX : extrafieldkey 2018-07-31 15:02:51 +02:00
John BOTELLA
4ddca02bb9 fix situation line's total 2018-07-31 14:58:33 +02:00
ATM-Nicolas
b9a44fc76b FIX : Wrong position of firstname lastname 2018-07-31 12:15:18 +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-quentin
37a4a0c488 fix for travis 2018-07-31 10:02:36 +02:00
Alexandre SPANGARO
0509a176ca
Merge branch 'develop' into 9.0_a3 2018-07-31 07:47:43 +02:00
Alexandre SPANGARO
b0e2e69ed0 New : Add project on salaries 2018-07-31 07:45:03 +02:00
Philippe GRAND
d673848028 standardize 2018-07-30 17:28:44 +02:00
ATM-Nicolas
1536bbc65e FIX : Keep same project when creating shipping from order 2018-07-30 15:16:53 +02:00
Philippe GRAND
fb565b15c5 standardize 2018-07-29 19:16:28 +02:00
Philippe GRAND
d1f100b0c9 standardize 2018-07-29 17:17:29 +02:00
tarrsalah
8278a9fa52 FIX filter supplier invoice list by societe name. 2018-07-29 13:18:05 +01:00
Philippe GRAND
de70bf983e standardize 2018-07-29 13:40:35 +02:00
Philippe GRAND
69feb3af14 standardize 2018-07-29 11:33:52 +02:00
Philippe GRAND
892174cbf8 standardize 2018-07-29 10:29:12 +02:00
Frédéric FRANCE
7dada7ae8e
fix #8820 2018-07-29 09:15:42 +02:00
Philippe GRAND
36ea20b7d4 standardize 2018-07-28 18:03:14 +02:00
Philippe GRAND
9cc40fcb21 standardize 2018-07-28 17:26:56 +02:00
Philippe GRAND
f17275845d standardize 2018-07-28 14:29:28 +02:00
Philippe GRAND
5a4524451c standardize 2018-07-28 14:02:33 +02:00
Philippe GRAND
541e919ae0 Clean and update code 2018-07-27 14:49:33 +02: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
Philippe GRAND
4eacad52f2 Clean and update code 2018-07-27 10:06:56 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
atm-quentin
1297470c99 FIX project overview (can use any fields as fk_projet) 2018-07-26 15:05:32 +02:00
Frédéric FRANCE
fa2de55109
test include 2018-07-26 11:50:54 +02:00
Frédéric FRANCE
3f4db55614
test include 2018-07-26 11:34:51 +02:00
Frédéric FRANCE
0952cf5e2b
fix no link in order list 2018-07-26 10:43:50 +02:00
Frédéric FRANCE
2dd907a8e1
extrafield totalizable 2018-07-26 09:41:44 +02:00
Philippe GRAND
efa6ad0659 Clean and update code 2018-07-25 19:05:40 +02:00
Regis Houssin
e48eec583d FIX compatibility with multicompany transverse mode 2018-07-25 17:00:49 +02:00
Philippe GRAND
ff04cb64c0 Clean and update code 2018-07-25 15:36:50 +02:00
Philippe GRAND
7d5464cfbc Clean and update code 2018-07-25 15:25:23 +02:00
Frédéric FRANCE
53469ee424
Update card-rec.php 2018-07-25 11:45:52 +02:00
gauthier
c95d6271a9 FIX : missing hook to edit sql 2018-07-25 11:15:13 +02:00
Frédéric FRANCE
08c4baad24
Update list.php 2018-07-25 10:15:34 +02:00
Frédéric FRANCE
cddb82f9be
Update element_resource.php 2018-07-25 10:11:44 +02:00
Frédéric FRANCE
f79415e740
Update payment.php 2018-07-25 10:08:01 +02:00
Frédéric FRANCE
c7ad6c9a7c
Update card-rec.php 2018-07-25 10:04:44 +02:00
Frédéric FRANCE
cac596037f
Update card.php 2018-07-25 09:50:04 +02:00
Laurent Destailleur
0c0c9269d5
Merge pull request #9148 from hregis/develop_api
FIX clean code
2018-07-24 21:41:41 +02:00
Laurent Destailleur
e024ea9c05
Merge pull request #9146 from grandoc/new_branch_24_07_2018
Clean and update code
2018-07-24 21:41:12 +02:00
Philippe
d7f58d0087 FIX search on ref project on propal list 2018-07-24 20:28:49 +02:00
Regis Houssin
ff733c5ad7 FIX clean code 2018-07-24 20:10:27 +02:00
Laurent Destailleur
dc2fec8f57 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-24 19:37:04 +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
Philippe GRAND
2a6f050e32 Clean and update code 2018-07-24 18:28:56 +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
b992c4b260
Merge pull request #9117 from frederic34/patch-11
remove commented log
2018-07-24 17:37:46 +02:00
Laurent Destailleur
9d1b7e25f7
Merge pull request #9127 from IAS-SYSTEMS-CSC/develop
Fix if time spent minutes was zero
2018-07-24 17:35:33 +02:00
Laurent Destailleur
dc34794ef1
Merge pull request #9120 from grandoc/new_branch_18_07_2018
clean and update code
2018-07-24 17:33:22 +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
Laurent Destailleur
2b7735ec71 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-24 17:06:55 +02:00
Laurent Destailleur
7e9a2c5ec7 Fix #9092 2018-07-24 17:06:41 +02:00
Frédéric FRANCE
bde30b85ad
use defaut currency for supplier order 2018-07-24 17:06:12 +02:00
Laurent Destailleur
c1002e7b41
Merge pull request #9123 from atm-maxime/new_timespent_numeric
NEW Allow to enter a timespent with a numeric value
2018-07-24 16:58:24 +02:00
Laurent Destailleur
42e8bcb832
Merge pull request #9122 from grandoc/new_branch_19_07_2018
Clean and update code
2018-07-24 16:56:38 +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
Laurent Destailleur
3e54ee5df7
Merge pull request #9131 from fappels/7.0_Fix_syslog_infinite_loop
Fix chromephp firephp Syslog infinite loop
2018-07-24 16:53:32 +02:00
Laurent Destailleur
aa5319fc4d
Merge pull request #9137 from grandoc/new_branch_23_07_2018
clean and update code
2018-07-24 16:51:25 +02:00
Regis Houssin
20a1ffe810 FIX field is autoincrement but not "rowid" 2018-07-24 12:15:54 +02:00
Regis Houssin
25c93de801 FIX missing drop old postgresql unique key 2018-07-24 11:23:44 +02:00
Laurent Destailleur
ccd7332647 Fix default value of joinfile when creating a new email template 2018-07-24 01:46:14 +02:00
Laurent Destailleur
a1bdc6022d Website module 2018-07-24 01:10:38 +02:00
Chl
0f115dafee 2 bugfix for PDF generated by Templates/Cron: DueDate and translation
When launching Cron on a facturerec with auto_validate at 1, the
generated PDF doesn't contain the DueDate, and some tokens like
__INVOICE_PREVIOUS_MONTH_TEXT__ in the public notes are not
translated (tested with fr_FR).
2018-07-24 00:39:21 +02:00
Chl
4995a0feb1 Translation: adding 'Enable' term in main
compta/facture/fiche-rec.php uses 'Enable' / 'Disable' in a button text
but no translation is available for 'Enable'.

Another option would be to change 'Enable' to 'Activate' in
fiche-rec.php but I guess this word will probably be useful in other
places.
2018-07-24 00:38:48 +02:00
Philippe GRAND
442ffb95ba clean and update code 2018-07-23 17:57:11 +02:00
Philippe GRAND
3297554102 clean and update code 2018-07-23 17:45:38 +02:00
Philippe GRAND
e755fde52a clean and update code 2018-07-23 17:35:30 +02:00
Philippe GRAND
365ed9c5de clean and update code 2018-07-23 17:28:19 +02:00
Philippe GRAND
1dd39a4c5c clean and update code 2018-07-23 17:21:51 +02:00
Laurent Destailleur
18125d56e5 css 2018-07-23 14:10:59 +02:00
Laurent Destailleur
174394c476 Work on website module 2018-07-23 14:08:20 +02:00
Laurent Destailleur
df7a3598a8 Trans 2018-07-23 10:56:28 +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
45c7a47d7f Module website 2018-07-22 17:18:35 +02:00
Laurent Destailleur
e9fccec055 Fix website deletion 2018-07-22 16:56:11 +02:00
Laurent Destailleur
c4e207e8b7 Fix dol_string_onlythesehtmltags 2018-07-22 15:51:19 +02:00
fappels
b697307bac Fix chromephp firephp Syslog infinite loop.
When chromephp/firephp not found ->trans causes infinite loop. Can
happen when files moved to other server or location.
2018-07-22 10:41:39 +02:00
Laurent Destailleur
2c7029850a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/website.lib.php
	htdocs/website/index.php
2018-07-21 20:28:26 +02:00
Laurent Destailleur
1d8c42265c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/modules/modFacture.class.php
2018-07-21 20:26:19 +02:00
Laurent Destailleur
a1180f79bd Fix missing customer code and ref customer 2018-07-21 12:56:18 +02:00
Regis Houssin
5cdc9db1f8 FIX add html comment 2018-07-20 18:45:52 +02:00
Regis Houssin
719db2574e FIX check if "confirmed" mode 2018-07-20 18:39:18 +02:00
Regis Houssin
e9d9954380 FIX do not convert llx_const if mysql encrypt/decrypt is used 2018-07-20 18:33:14 +02:00
Regis Houssin
984a8e3720 FIX disable/enable foreign key checking for avoid errors 2018-07-20 17:28:32 +02:00
John BOTELLA
0c01f6e139 Fix situation invoice status 2018-07-20 15:53:32 +02:00
ias-ceo
84bfe2965b if time spent minutes zero 2018-07-20 16:16:27 +03:00
Laurent Destailleur
f419964c76 Fix Debug website module 2018-07-20 15:01:50 +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
8247bb683c Debug website module 2018-07-19 21:35:21 +02:00
Maxime Kohlhaas
22d94a570a Allow to enter a timespent with a numeric value 2018-07-19 19:04:07 +02:00
Philippe GRAND
010c5af245 Clean and update code 2018-07-19 16:48:20 +02:00
Laurent Destailleur
445db58966 FIX website in inline edit mode 2018-07-19 16:06:48 +02:00
Laurent Destailleur
e362a0e9df FIX website in inline edit mode 2018-07-19 16:06:06 +02:00
Laurent Destailleur
efa5cdeab1 More complete list of allowed html tags 2018-07-19 15:24:48 +02:00
Philippe GRAND
74704acbcb clean and update code 2018-07-18 16:13:13 +02:00
Laurent Destailleur
5523312f87 Fix missing email 2018-07-18 15:36:07 +02:00
Laurent Destailleur
7273cb97b2 Fix trans 2018-07-18 14:32:51 +02:00
Laurent Destailleur
38de5a8f2a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-18 14:25:19 +02:00
Laurent Destailleur
bef777e19d Fix default order for bank entry list 2018-07-18 14:24:58 +02:00
Laurent Destailleur
19bb8a5091 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/accountancy.lang
2018-07-18 14:12:28 +02:00
Laurent Destailleur
33d67ea332 Fix ref on list 2018-07-18 14:09:44 +02:00
Laurent Destailleur
4beca8d989 Fix restore look and feel 2018-07-18 13:00:38 +02:00
Laurent Destailleur
6ad0cd37b0 Translation 2018-07-18 11:57:49 +02:00
Laurent Destailleur
66f9153490 Fix css 2018-07-18 11:33:53 +02:00
Chl
b306394c15 corr. group by pour PostgreSQL 2018-07-17 23:57:21 +02:00
Laurent Destailleur
f60e04dcb4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-17 22:33:36 +02:00
Laurent Destailleur
cecb0f8829 Fix missing lib 2018-07-17 22:33:20 +02:00
Laurent Destailleur
4b044779dc Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-17 22:31:58 +02:00
Laurent Destailleur
969aea98e1 Fix label of copy must not be same 2018-07-17 22:31:28 +02:00
Laurent Destailleur
47cb1f920e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-17 21:43:08 +02:00
Laurent Destailleur
7662f8f25c Fix balance 2018-07-17 21:39:41 +02:00
Laurent Destailleur
c68b9493e5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-17 21:21:20 +02:00
Laurent Destailleur
a7853211d6 Fix balance when sorting of value date desc 2018-07-17 21:20:38 +02:00
Laurent Destailleur
45b298a5d0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions.lib.php
2018-07-17 18:17:36 +02:00
Laurent Destailleur
34c2facff1 Fix missing link on bank account 2018-07-17 18:16:30 +02:00
Laurent Destailleur
7dc552a54e Fix alignement 2018-07-17 18:10:42 +02:00
Laurent Destailleur
cbc4a04465 Fix nowrap on smartphone 2018-07-17 18:05:49 +02:00
Frédéric FRANCE
1a58a40f77
remove commented log 2018-07-17 16:48:34 +02:00
Laurent Destailleur
26507ee712 Code comment 2018-07-17 14:02:08 +02:00
Laurent Destailleur
7fcec5f6c3 Fix duplicate tab "contact" on thirdparty 2018-07-17 13:54:13 +02:00
Laurent Destailleur
8249179fb8 Fix duplicate tab "contact" on thirdparty 2018-07-17 13:50:26 +02:00
Laurent Destailleur
d4a5491753 Fix duplicate tab "contact" on thirdparty 2018-07-17 13:48:08 +02:00
Laurent Destailleur
508133b336 Clean code 2018-07-17 13:04:54 +02:00
Steve
9d3a0442c0 dolibarr-develop, php 7.2.7
On third party, add bank account. After spanish account has been added, on summary screen
..../htdocs/societe/paymentmodes.php

a correct account number causes the error:
Warning: A non-numeric value encountered in .......\public_html\dolibarr-develop\htdocs\core\lib\bank.lib.php on line 359

This is
`$sum += $values[$i] * substr($InumCta, $i, 1);`

Since substr returns a string it cannot be summed (I assume).

I changed it to
`$sum += $values[$i] * (int)substr($InumCta, $i, 1)`
2018-07-16 17:10:33 +02:00
Laurent Destailleur
651ba74007 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-16 15:45:50 +02:00
Laurent Destailleur
f747cefda3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/install/upgrade2.php
2018-07-16 15:44:44 +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
e5f2fbf8db Fix trans 2018-07-16 15:21:29 +02:00
Laurent Destailleur
8df834bd2a Debug module ticket 2018-07-16 12:13:34 +02:00
Laurent Destailleur
37e16b5ff2 Trans 2018-07-16 11:55:59 +02:00
Laurent Destailleur
41605ed4a7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2018-07-16 11:29:47 +02:00
Laurent Destailleur
e92ab19a06 Fix var not defined 2018-07-16 11:26:23 +02:00
Laurent Destailleur
c477ca8266 Fix scrutinizer 2018-07-16 11:25:21 +02:00
Laurent Destailleur
4128cee3ee Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-16 11:21:29 +02:00
Laurent Destailleur
e3d9e609d5 Fix var not defined 2018-07-16 11:20:54 +02:00
ATM-Nicolas
3c5998e697 FIX : Refactoring 2018-07-16 11:16:55 +02:00
Laurent Destailleur
d3cc2c81eb Better detail for time elapsed 2018-07-16 11:14:39 +02:00
Laurent Destailleur
89cc048fff FIX Init of contact in combo list when thirdparty not yet known 2018-07-16 10:46:10 +02:00
Laurent Destailleur
c94437c3cf Fix file in wrong dir 2018-07-16 10:14:51 +02:00
Laurent Destailleur
35ed89a517 Fix scrutinizer 2018-07-16 10:11:52 +02:00
Laurent Destailleur
76c6f28d85
Merge pull request #9035 from grandoc/new_branch_29_06_2018
update code
2018-07-16 10:09:46 +02:00
Laurent Destailleur
6bf4ef5ef4
Fix double "
Fix double "
2018-07-16 10:09:13 +02:00
Laurent Destailleur
e72e56ce2d
Merge pull request #9041 from grandoc/new_branch_02_07_2018
update description code
2018-07-16 10:03:54 +02:00
Laurent Destailleur
3eac1f410d
Merge pull request #8983 from atm-greg/Add_hook_on_replenish
Add hook on replenish
2018-07-16 10:02:26 +02:00
Laurent Destailleur
3710f95719 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/exports.lang
2018-07-16 10:01:23 +02:00
Laurent Destailleur
6846ff7d21 Fix problem in some vars as reported in #8955 2018-07-16 09:57:45 +02:00
ATM-Nicolas
9d60b0a8c6 Merge branch '7.0' of github.com:Dolibarr/dolibarr into 7.0 2018-07-16 09:47:16 +02:00
Steve
2cf28e055b more minor grammar corrections
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/langs/en_US/companies.lang
	htdocs/langs/en_US/exports.lang
	htdocs/langs/en_US/mails.lang
	htdocs/langs/en_US/products.lang
	htdocs/langs/en_US/sms.lang
2018-07-16 09:43:19 +02:00