lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
68,401 Commits 43 Branches 150 Tags 886 MiB
d5aed3394d
Commit Graph

59676 Commits

Author SHA1 Message Date
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
ATM-Nicolas
de8fd3d12c NEW : Contact substitutions keys 2018-07-16 09:33:14 +02:00
Laurent Destailleur
387abf2da8
Merge pull request #9057 from inoveaconseil/checkRightOnLink 
ADD Check right on link
 2018-07-16 09:31:21 +02:00
Laurent Destailleur
ae76e61885
Merge pull request #9108 from torvista/misc-texts 
more minor grammar corrections
 2018-07-16 09:23:10 +02:00
Steve
bd9149e03b more minor grammar corrections 2018-07-16 07:28:22 +02:00
Laurent Destailleur
d968a61445 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-15 20:17:17 +02:00
Laurent Destailleur
1e42db0641 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-15 20:16:54 +02:00
Laurent Destailleur
f3b7bc53bd Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/tpl/extrafields_list_print_fields.tpl.php
 2018-07-15 20:16:08 +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
9b644fb92f
Merge pull request #9054 from grandoc/new_branch_05_07_2018 
docs: complete comments
 2018-07-15 20:12:21 +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
bff4ed8103
Merge pull request #9098 from atm-florian/develop 
fix list of event of thirdparty and unformize code
 2018-07-15 20:10:19 +02:00
Laurent Destailleur
a5442033ac Code comment 2018-07-15 20:09:51 +02:00
Laurent Destailleur
ba36d1aef0
Merge pull request #9095 from IAS-SYSTEMS-CSC/dolibarr-fixes 
fix sql error functions.lib.php
 2018-07-15 20:00:54 +02:00
Laurent Destailleur
0ca9f6f522
Update functions.lib.php 2018-07-15 20:00:43 +02:00
Laurent Destailleur
b796c10534
Merge pull request #9101 from hregis/develop_api 
NEW can add documents on agenda events using API REST
 2018-07-15 19:59:52 +02:00
Laurent Destailleur
4279ba66e1
Merge pull request #9103 from grandoc/new_branch_13_07_2018 
fix: breacking link
 2018-07-15 19:59:10 +02:00
Laurent Destailleur
29c76a3f56
Merge pull request #9090 from grandoc/new_branch_10_07_2018 
New branch 10 07 2018
 2018-07-15 19:52:07 +02:00
Laurent Destailleur
0ce101f395
Merge pull request #9096 from grandoc/new_branch_12_07_2018 
update code and typo
 2018-07-15 19:48:05 +02:00
Laurent Destailleur
20e360e918 Start to introduce array fields for products 2018-07-15 18:22:26 +02:00
Laurent Destailleur
a45ac4519a Fix translation 2018-07-15 18:03:31 +02:00
Philippe GRAND
9ae7e55fea fix: breaking link 2018-07-13 19:54:37 +02:00
Laurent Destailleur
988b6a49d2 Fix warning php 7.3 2018-07-13 18:40:54 +02:00
Regis Houssin
e1dabe3924 NEW add agenda documents in API REST 2018-07-13 16:07:19 +02:00
ATM-Nicolas
170a668b2b FIX : Set contactCivName substitution key 2018-07-13 11:09:56 +02:00
Laurent Destailleur
1e775ffa6e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-13 09:12:01 +02:00
Laurent Destailleur
c27dd8d301 Fix phpcs 2018-07-13 09:11:46 +02:00
Laurent Destailleur
e4be3ab954 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-13 09:09:51 +02:00
Laurent Destailleur
1b33703cd8 Fix missing country code 2018-07-13 09:08:42 +02:00
florian HENRY
09fe2f83fa Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2018-07-12 18:27:22 +02:00
florian HENRY
1fa13fc747 fix list of event unformize code 2018-07-12 18:27:09 +02:00
Laurent Destailleur
ebe5325f2b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-12 18:06:26 +02:00
Laurent Destailleur
52dee71b39 Responsive 2018-07-12 18:06:06 +02:00
Laurent Destailleur
872895c0b6 Code comment 2018-07-12 11:17:21 +02:00
Philippe GRAND
6945680e03 update code and typo 2018-07-12 10:11:42 +02:00
ias-ceo
740f35966c installation default port number if missing 2018-07-12 05:15:09 +03:00
ias-ceo
076bf0a3a7 fix sql error 2018-07-12 05:09:36 +03:00
atm-ph
0c252d9778 Fix user rights overrided by user group rights 2018-07-11 18:09:29 +02:00
gauthier
80ff7fa86f FIX : case when we valid form with keyboard 2018-07-11 15:18:30 +02:00
Laurent Destailleur
22ab4c54a6
Merge pull request #9089 from atm-florian/dev_addcactiontrigger 
Add DELETE Trigger action into admin event agenda log
 2018-07-11 10:56:35 +02:00
Laurent Destailleur
b203421ac6 Fix log 2018-07-11 10:54:42 +02:00
Laurent Destailleur
2e36e5afa5 Some fix with dolistore api 2018-07-11 10:47:55 +02:00
Laurent Destailleur
6eb9f13ec2 Fix warning 2018-07-11 10:01:26 +02:00
gauthier
103c7e6d06 FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied) 2018-07-11 09:51:36 +02:00
Laurent Destailleur
4c65f4d498 Log 2018-07-11 09:38:40 +02:00
Regis Houssin
f52187e829 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_price 2018-07-11 08:22:13 +02:00
Philippe GRAND
72adc485f0 Docs : Update and complete 2018-07-10 22:32:55 +02:00
florian HENRY
2f2ca16e2b Add DELETE Trigger action into admin event agenda log 2018-07-10 16:44:14 +02:00
Laurent Destailleur
4c363d1d4f Trans 2018-07-10 15:08:51 +02:00
Philippe GRAND
0d10722a7f Docs : Update and complete 2018-07-10 14:57:23 +02:00
Laurent Destailleur
f3de1af601 Finish webdav experimental module 2018-07-10 14:56:04 +02:00
Laurent Destailleur
64517d4c0b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/en_US/admin.lang
 2018-07-10 14:06:51 +02:00
Laurent Destailleur
5f52dfa873 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-10 14:02:40 +02:00
Laurent Destailleur
44626a3a48 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-07-10 13:57:24 +02:00
Laurent Destailleur
aeb5f5e4f3 Fix phpcs 2018-07-10 13:56:03 +02:00
Laurent Destailleur
a55abb4da7 Fix version 2018-07-10 13:54:20 +02:00
Laurent Destailleur
cbc17d4658 Fix ecm when using multicompany 2018-07-10 12:03:51 +02:00
Laurent Destailleur
b6180fcb58 Fix fetch index in ecm when using multicompany 2018-07-10 12:00:09 +02:00
Laurent Destailleur
bda142d82d
Update commande.class.php 2018-07-10 11:10:55 +02:00
Laurent Destailleur
c0d6aee040
Update propal.class.php 2018-07-10 11:10:01 +02:00
Laurent Destailleur
ed3023f7d9
Update propal.class.php 2018-07-10 11:09:08 +02:00
Laurent Destailleur
dc7fcc009b
Update propal.class.php 2018-07-10 10:56:45 +02:00
Laurent Destailleur
8e0a663b7c Code comment 2018-07-10 10:53:59 +02:00
Laurent Destailleur
3231f0031c
Merge pull request #9085 from grandoc/new_branch_10_07_2018 
Docs : Update and complete
 2018-07-10 10:43:32 +02:00
Laurent Destailleur
f33beb287c
Merge pull request #9080 from grandoc/new_branch_09_07_2018 
Docs : update and complete comments
 2018-07-10 10:42:47 +02:00
Laurent Destailleur
c01975a40b
Merge pull request #9084 from torvista/texts-setup-en_US 
Texts corrections /langs/en_US
 2018-07-10 10:41:28 +02:00
Laurent Destailleur
31d5b739e7
Merge pull request #9048 from hregis/8.0_rights 
NEW possibility to add all rights of all modules in one time
 2018-07-10 10:38:17 +02:00
Philippe GRAND
243bc49a90 Docs : Typo 2018-07-10 09:38:05 +02:00
Philippe GRAND
b92190ac69 Docs : Update and complete 2018-07-10 09:32:55 +02:00
Laurent Destailleur
86ee37e885 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-07-09 20:16:42 +02:00
Laurent Destailleur
bd1e430a28 Synch transifex 2018-07-09 20:15:14 +02:00
Philippe GRAND
df1bead49b Docs : update and complete comments 2018-07-09 19:04:50 +02:00
Steve
e45e74a3bd spelling and some grammar corrections to en_US 2018-07-09 17:38:28 +02:00
Marc de Lima Lucio
2ba7c07574 FIX: propal: correctly preset project when creating with origin/originid 2018-07-09 17:34:31 +02:00
Philippe GRAND
b4b3e33e3e Docs : update and complete comments 2018-07-09 17:22:34 +02:00
Laurent Destailleur
e0c3d176ed
Merge pull request #9067 from torvista/install-texts-en_US 
spelling and some grammar corrections for installation texts en_US
 2018-07-09 17:11:58 +02:00
Laurent Destailleur
3cda462faf
Merge pull request #9065 from aspangaro/9.0_a1 
Add customer accountancy code on deposit slips export
 2018-07-09 17:08:13 +02:00
Laurent Destailleur
19c652ce06
Merge pull request #9066 from hregis/8.0_product 
Fix: differentiate customer prices from supplier prices sharing with getEntity("productsupplierprice")
 2018-07-09 17:05:36 +02:00
Laurent Destailleur
d5cb2fc4cd
Update productcustomerprice.class.php 2018-07-09 17:04:50 +02:00
Laurent Destailleur
551e2efe86
Update productcustomerprice.class.php 2018-07-09 17:03:55 +02:00
Laurent Destailleur
2ef78bee0b Revert "FIX side nav height." 
This reverts commit 78ba8bc3b5.
 2018-07-09 16:16:07 +02:00
Laurent Destailleur
754ec22cfe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-09 15:40:11 +02:00
Laurent Destailleur
699df860d8 Code comment 2018-07-09 15:39:59 +02:00
Laurent Destailleur
959a75c51e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-07-09 15:38:54 +02:00
Laurent Destailleur
f5d9403c7d Fix permission to see HR tab on user. All HR on same tabs. 2018-07-09 15:38:00 +02:00
Laurent Destailleur
052d86f3ca
Merge pull request #9073 from tarrsalah/fix-side-nav-css 
FIX side nav height.
 2018-07-09 15:37:03 +02:00
Laurent Destailleur
ba6566867e
Merge pull request #9064 from grandoc/new_branch_06_07_2018 
fix : typo and update code
 2018-07-09 15:33:25 +02:00
Laurent Destailleur
2d74f03d34
Merge pull request #9077 from grandoc/new_branch_09_07_2018 
Docs : update and complete
 2018-07-09 15:32:34 +02:00
Laurent Destailleur
70114a8d7d
Merge pull request #9072 from hregis/8.0_multicompany 
FIX missing entity field
 2018-07-09 15:31:22 +02:00
Laurent Destailleur
8184eff66c Fix for #9079 2018-07-09 15:25:14 +02:00
Laurent Destailleur
c33aaa076d FIX #8984 button create expense report 2018-07-09 14:35:22 +02:00
Laurent Destailleur
e427496ddf FIX Injection 2018-07-09 14:13:01 +02:00
Philippe GRAND
2c4d7c4835 Docs : update and complete 2018-07-09 14:06:59 +02:00
Laurent Destailleur
d3d1b6d513 NEW Can enable a module, even external module, from command line 2018-07-09 13:02:01 +02:00
Philippe GRAND
12d4880e7b Docs : update and complete 2018-07-09 10:08:27 +02:00
John BOTELLA
1daba56bbc Fix count(): Parameter must be an array or an object that implements Countable 2018-07-09 10:05:53 +02:00
Laurent Destailleur
291f149a9b NEW Can set a tooltip help text on extrafields 2018-07-08 20:26:48 +02:00
Laurent Destailleur
41f21f3867 Translation 2018-07-08 20:06:24 +02:00
Laurent Destailleur
8ec9257302 Fix translation 2018-07-08 20:03:14 +02:00
tarrsalah
78ba8bc3b5 FIX side nav height. 2018-07-08 14:07:06 +01:00
Regis Houssin
3e5271967b FIX missing entity field 2018-07-08 12:11:22 +02:00