Commit Graph

66434 Commits

Author SHA1 Message Date
Laurent Destailleur
d2d28ac851
Merge pull request #8629 from hregis/develop_pgsql
Fix: correct syntax for postgresql
2018-04-17 21:28:07 +02:00
Regis Houssin
ad197d01c1 Fix: avoid error 2018-04-17 21:16:17 +02:00
Regis Houssin
bab32e05e7 Fix: best practice for sequence 2018-04-17 21:08:40 +02:00
Laurent Destailleur
c551bf20e2 sys 2018-04-17 21:06:26 +02:00
Regis Houssin
c07b5d684c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_pgsql 2018-04-17 19:37:38 +02:00
Laurent Destailleur
5f3de7f97e Doc 2018-04-17 19:23:05 +02:00
Regis Houssin
955ff14c6f Fix: correct syntax for postgresql 2018-04-17 19:06:14 +02:00
Laurent Destailleur
dd46d97138
Merge pull request #8628 from hregis/develop_multicompany
Fix: syntax error with postgresql
2018-04-17 18:55:46 +02:00
Laurent Destailleur
fb81ce5117 Some fixes for postgresl migration 2018-04-17 18:32:04 +02:00
Regis Houssin
6d7bd7ce1e Fix: syntax error with postgresql 2018-04-17 18:26:37 +02:00
Laurent Destailleur
fee4966219
Merge pull request #8601 from frederic34/esign
NEW add optional esign field in pdf propal
2018-04-17 16:12:53 +02:00
Laurent Destailleur
bf4daa4752
Merge pull request #8622 from frederic34/contratlist
NEW display total on contract service list
2018-04-17 16:08:26 +02:00
Frédéric FRANCE
aec601dbcc
display total on contract service list 2018-04-17 15:40:12 +02:00
Laurent Destailleur
89a6841fbc Debug ticket module 2018-04-17 14:51:08 +02:00
Laurent Destailleur
8c23fe6764 Fix td 2018-04-17 14:49:21 +02:00
Laurent Destailleur
2135365e0a Bug new extrafields architecture 2018-04-17 14:44:55 +02:00
Laurent Destailleur
89b5114882 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-17 14:34:37 +02:00
Laurent Destailleur
4dadfac74b Debug usage of the new extrafield architecture 2018-04-17 14:34:17 +02:00
Laurent Destailleur
7bb8078b46 Fix translation of extrafields 2018-04-17 13:52:50 +02:00
Laurent Destailleur
7b53ec5198 FIX timestamp must be an int not a float 2018-04-17 12:41:13 +02:00
Laurent Destailleur
7d3da25132
Merge pull request #8614 from ptibogxiv/patch-25
ADD minimal amount to require 3Dsecure if it's possible
2018-04-17 11:05:22 +02:00
ptibogxiv
3acd1b536b
Update stripe.php 2018-04-17 10:15:14 +02:00
ptibogxiv
8db9d19521
ADD minimal amount to require 3Dsecure if it's possible 2018-04-17 10:14:36 +02:00
Laurent Destailleur
d2f0d1f613 Add option MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY because it is hard
to understand how it works when list is preloaded.
2018-04-17 10:01:14 +02:00
Laurent Destailleur
72c3a60d24 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-17 09:46:11 +02:00
Laurent Destailleur
80ece31631
Merge pull request #8607 from ATM-Marc/FIX_leftmenu_search
FIX: left search form: directly display all qualified objects
2018-04-17 09:45:55 +02:00
Laurent Destailleur
c3970f1a52 Code comment 2018-04-17 09:44:57 +02:00
Laurent Destailleur
7b3a9de9db
Merge pull request #8603 from frederic34/logintransp
login transparent when using background
2018-04-17 09:35:47 +02:00
Laurent Destailleur
f06412ebc1
Update style.css.php 2018-04-17 09:35:25 +02:00
Laurent Destailleur
1e0a660d24 More font awesome picto instead of img 2018-04-16 19:57:46 +02:00
Laurent Destailleur
106fb87d0a NEW Can sort order of files in attach tab for leave and expensereport 2018-04-16 19:25:27 +02:00
Laurent Destailleur
faea6861c3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
	htdocs/langs/en_US/bills.lang
2018-04-16 18:19:21 +02:00
Laurent Destailleur
f19abe38d7 FIX pdf thumb for expense report 2018-04-16 18:17:35 +02:00
Laurent Destailleur
27a8476117 FIX remove var_dump 2018-04-16 17:02:54 +02:00
Marc de Lima Lucio
ba50fcd130 FIX: left search form: directly display all qualified objects 2018-04-16 15:15:35 +02:00
Laurent Destailleur
622042e9b2 FIX Max nb of generation of recurring invoice should not show warning 2018-04-16 15:05:35 +02:00
Laurent Destailleur
50d86a7cfd Fix accounting area when advanced accounting module not enabled 2018-04-16 14:25:39 +02:00
Laurent Destailleur
f1ad3912e7 Fix multicompany compatibility for recurring invoice generation 2018-04-16 14:18:38 +02:00
Laurent Destailleur
14ed19265c FIX environment shown on cron card 2018-04-16 13:53:59 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Laurent Destailleur
c702c88fde CSS 2018-04-16 13:11:48 +02:00
Laurent Destailleur
e7f6785a53 Add log 2018-04-16 12:23:24 +02:00
Laurent Destailleur
f05cc8b310 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-16 11:20:44 +02:00
Laurent Destailleur
0d26bdcdc5 FIX Button receive products not visible 2018-04-16 11:20:29 +02:00
Laurent Destailleur
d549090290 Fix translation of button action must be a verb 2018-04-16 11:12:56 +02:00
Laurent Destailleur
99633eb815 FIX button "Classify bill" on supplier order was not visible 2018-04-16 11:12:27 +02:00
Laurent Destailleur
8c307987d8 css 2018-04-16 00:26:13 +02:00
Laurent Destailleur
ecb50a8a6d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-15 22:02:05 +02:00
Laurent Destailleur
69c26e19a8 NEW Can edit the text color for title line of tables 2018-04-15 22:01:52 +02:00
Laurent Destailleur
56a634bec3 Look and feel v7 2018-04-15 20:17:04 +02:00