Commit Graph

58502 Commits

Author SHA1 Message Date
BENKE Charlie
9871bc3d9a Update 5.0.0-6.0.0.sql 2017-03-26 19:35:00 +02:00
BENKE Charlie
d60f1d8402 add price_level on product_customer_price_log
fk_soc can be 0 when generic price is stored on log
2017-03-26 19:29:16 +02:00
BENKE Charlie
d8018f7937 add trigger on product price add/update 2017-03-26 19:16:19 +02:00
BENKE Charlie
3299e5f889 PRODUCT_PRICE_SUPPLIER_NO_LOG test inverted
if PRODUCT_PRICE_SUPPLIER_NO_LOG is empty, no log is stored
if PRODUCT_PRICE_SUPPLIER_NO_LOG is not empty log is stored
they are inversion
@eldy maybe add more field in this table
2017-03-26 19:13:10 +02:00
Laurent Destailleur
9f0328ab7f Hidden for the moment because option specific to one theme only. 2017-03-26 13:11:01 +02:00
Laurent Destailleur
95fbe0147d Merge pull request #6585 from defrance/patch-99
display input border by setting
2017-03-26 13:06:48 +02:00
Laurent Destailleur
ca3a39b71e Merge pull request #6588 from defrance/patch-100
Bad parasite caracters
2017-03-26 01:51:04 +01:00
Laurent Destailleur
ba59c27754 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-26 01:46:08 +01:00
Laurent Destailleur
9a85e5ef00 Enhance the file checker 2017-03-26 01:45:09 +01:00
BENKE Charlie
dfb24a13d9 Bad parasite caracters
TD not good
2017-03-25 23:48:30 +01:00
Laurent Destailleur
5b97736bb0 Merge pull request #6576 from defrance/patch-97
FIX : supplier default condition not retrived on create
2017-03-25 21:22:44 +01:00
Laurent Destailleur
edf28b59d6 Merge pull request #6571 from defrance/patch-94
display total line for all total line
2017-03-25 21:18:16 +01:00
Laurent Destailleur
8c2b70c4a7 Fix filechecker 2017-03-25 20:51:02 +01:00
BENKE Charlie
acfdc96121 Border input display is allowed by setting 2017-03-25 19:34:04 +01:00
BENKE Charlie
aa5ff36a04 display input border by setting 2017-03-25 19:04:27 +01:00
Laurent Destailleur
3c9d336148 Fix error message 2017-03-25 17:05:27 +01:00
BENKE Charlie
1cc8671433 FIX : supplier default condition not retrived on create 2017-03-25 12:06:02 +01:00
Laurent Destailleur
7dd2a3b130 Merge pull request #6574 from defrance/patch-95
add next_prev_filter for pagination on product
2017-03-25 11:55:14 +01:00
BENKE Charlie
ec3402a04b Update note.php 2017-03-25 10:52:03 +01:00
BENKE Charlie
656875acb5 Update info.php 2017-03-25 10:49:57 +01:00
BENKE Charlie
a1db02cc08 Update fournisseurs.php 2017-03-25 10:48:50 +01:00
BENKE Charlie
cf68039c36 Update document.php 2017-03-25 10:47:42 +01:00
BENKE Charlie
2e6ab393df add next_prev_filter for pagination 2017-03-25 10:45:01 +01:00
Laurent Destailleur
292bcae592 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-25 00:05:04 +01:00
Laurent Destailleur
720a820ee4 border-bottom not required. 2017-03-25 00:04:21 +01:00
BENKE Charlie
db76a05d0c Update list.php 2017-03-24 23:53:32 +01:00
Laurent Destailleur
6b33a755ba Add more log on tableDnD 2017-03-24 23:52:06 +01:00
BENKE Charlie
3aff053828 Update list.php 2017-03-24 23:40:34 +01:00
BENKE Charlie
94a1fc19fa display total line for all total line 2017-03-24 23:39:25 +01:00
Laurent Destailleur
278bbf184c Merge pull request #6546 from aspangaro/6.0-new_bank_direct_input
New : Add Various payment submodule linked to the accountancy to replace free input in bank
2017-03-24 22:52:39 +01:00
Laurent Destailleur
df17de9d48 Merge pull request #6543 from laudeco/feature/expenseNoteFusionPdf
add 'fusion pdf' in mass action of expense report
2017-03-24 22:50:54 +01:00
Laurent Destailleur
6f3231745e Merge pull request #6564 from tiaris/devcamp
bug 6563 installation issue with
2017-03-24 22:47:50 +01:00
Laurent Destailleur
71378028f4 Merge pull request #6562 from defrance/patch-92
error on install
2017-03-24 22:44:11 +01:00
Laurent Destailleur
f05dfdbc81 Merge pull request #6569 from defrance/patch-93
Display totalLine if one of total field are present
2017-03-24 22:43:43 +01:00
BENKE Charlie
2b1c29316f Display totalLine if one of total field are present 2017-03-24 22:13:58 +01:00
Laurent Destailleur
d1a988a0be Fix document_preview is possible on files with + chars inside. 2017-03-24 17:32:38 +01:00
jean
cdb1de7596 bug 6563 installation issue with
doctemplates/usergroups/template_usergroups.odt
2017-03-24 16:48:44 +01:00
BENKE Charlie
80f78e66bb error on install 2017-03-24 15:30:46 +01:00
Laurent Destailleur
38660418b4 Include preview of pdf into dol_banner 2017-03-23 22:27:44 +01:00
Laurent Destailleur
664380d304 Css enhancement 2017-03-23 21:24:57 +01:00
Laurent Destailleur
cb0eb26faa Fix phpunit 2017-03-23 20:37:04 +01:00
Laurent Destailleur
f241bfefd0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 20:20:59 +01:00
Laurent Destailleur
b189e3e394 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-03-23 20:12:25 +01:00
Laurent Destailleur
be0d5bee78 Fix phpcs 2017-03-23 20:07:46 +01:00
Laurent Destailleur
2062047dea Merge pull request #6555 from atm-gauthier/5.0_fix_originid_on_supplierorder
FIX : origin & origin id on supplier order line
2017-03-23 20:03:58 +01:00
Laurent Destailleur
32f05aa89f Merge pull request #6554 from atm-gauthier/5.0_fix_units_on_supplierproposal
FIX : forgotten fk_unit field on llx_supplier_propaldet
2017-03-23 20:00:10 +01:00
Laurent Destailleur
eb145faffd Replace parameter mixte with textselect 2017-03-23 19:57:45 +01:00
Laurent Destailleur
d1c29bf698 Merge pull request #6552 from defrance/patch-91
NEW : introducing "mixte" mode for select_duration
2017-03-23 19:54:33 +01:00
Laurent Destailleur
3cc312d485 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/main.lang
2017-03-23 19:48:34 +01:00
Laurent Destailleur
4bc2864a6f Better board for open items 2017-03-23 19:26:28 +01:00