Commit Graph

67860 Commits

Author SHA1 Message Date
ptibogxiv
78edd035f8
add statement descriptor as newpayment.php 2018-08-08 10:12:25 +02:00
ptibogxiv
f6e5b71f21
Fix and compatibility for V8 and connect
fix for V8 release and optimal functionnality with connect mode
2018-08-06 12:29:38 +02:00
ptibogxiv
3c15da9dde
Fix payment in connect mode
I know that it's not an optimal fix but it's functionnal for dolibarr 8.0.0 release
2018-08-04 14:30:52 +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
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
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
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
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
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
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
Laurent Destailleur
18125d56e5 css 2018-07-23 14:10:59 +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
c4e207e8b7 Fix dol_string_onlythesehtmltags 2018-07-22 15:51:19 +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
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