Commit Graph

68865 Commits

Author SHA1 Message Date
Laurent Destailleur
5524784421 FIX prefilled date of order must have hours too 2018-06-16 15:24:31 +02:00
Laurent Destailleur
186f08e67b Fix preview of PDF for supplier objects 2018-06-16 15:08:13 +02:00
Laurent Destailleur
7981bd08b7 Fix price+sql error when adding product when no supplier price defined 2018-06-16 14:47:33 +02:00
Laurent Destailleur
4898f10fa2 FIX Adding a product with no supplier price defined yet 2018-06-16 13:49:28 +02:00
Laurent Destailleur
92952aea28 Trans 2018-06-16 13:23:58 +02:00
Laurent Destailleur
5908fc1471 Trans 2018-06-16 13:15:24 +02:00
atm-greg
72449ddef4 add hooks on stock replenish 2018-06-15 16:55:23 +02:00
Laurent Destailleur
c0d4715bdb Clean code 2018-06-15 16:29:26 +02:00
atm-ph
3c80ce501b Fix missing hook on usercard (addMoreActionsButtons) 2018-06-15 16:05:50 +02:00
altatof
5d6cd381b9 Fix <br/> detection 2018-06-15 15:59:14 +02:00
Laurent Destailleur
79cbdf7fd1 Code comment 2018-06-15 15:29:19 +02:00
Ferran Marcet
a21e138c70 Fix: Avoid converting into reduction twice and draft invoice 2018-06-15 11:19:04 +02:00
atm-ph
cb3704b67e Fix can't add an attribute simply 2018-06-15 11:02:46 +02:00
Inovea Conseil
d5a3e63e05 Fix missing paramater for generateDocument 2018-06-15 09:47:28 +02:00
Inovea Conseil
259c8ed60d Merge remote-tracking branch 'Dolibarr/develop' into develop 2018-06-15 09:02:22 +02:00
Laurent Destailleur
df28be443b Add syslog module in list of module reloaded in last migration step 2018-06-14 23:00:42 +02:00
Laurent Destailleur
f5c08c4b9f Doc website 2018-06-14 16:38:20 +02:00
Laurent Destailleur
25d656025a Fix use of alternative aliases is ok now 2018-06-14 16:33:11 +02:00
Laurent Destailleur
b37f7a6953 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-14 16:15:34 +02:00
Laurent Destailleur
e28aca6244 Fix workaround against p insertion by ckeditor 2018-06-14 16:15:06 +02:00
Regis Houssin
f9a86ba43f Fix: MEMBER_MODIFY trigger not called if i change only extrafields 2018-06-14 14:01:05 +02:00
Laurent Destailleur
bb6b27a206 Merge pull request #8959 from frederic34/backquote
remove back quote in llx_accounting_account_de.sql
2018-06-14 12:03:02 +02:00
Laurent Destailleur
9717a32a2e Merge pull request #8960 from grandoc/new_branch_13_06_2018
clean code
2018-06-14 12:01:19 +02:00
Laurent Destailleur
e18a5d148c Merge pull request #8962 from ATM-Marc/FIX_7.0_supplierorder_reffourn
FIX: supplier order: product supplier ref not saved on addline
2018-06-14 12:00:36 +02:00
gauthier
e9d65ea751 FIX : need to filter on aa.entity for same accounting accounts available in several entities 2018-06-14 11:56:22 +02:00
Laurent Destailleur
f79466d483 Trans 2018-06-14 11:41:14 +02:00
Marc de Lima Lucio
a5898b830b Merge branch 'develop' of github.com:Dolibarr/dolibarr into 7.0 2018-06-14 10:48:09 +02:00
Marc de Lima Lucio
a80e1c601c NEW: supplier order/order lines export: add supplier product ref 2018-06-14 10:43:01 +02:00
Marc de Lima Lucio
1dec4c4320 FIX: supplier order: product supplier ref not saved on addline 2018-06-14 10:37:40 +02:00
Laurent Destailleur
4900f1f1f1 Fix sql coding style 2018-06-13 23:10:29 +02:00
Laurent Destailleur
910652eb6d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
2018-06-13 23:07:30 +02:00
Laurent Destailleur
4c2af6fc70 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/html.form.class.php
2018-06-13 23:04:08 +02:00
Laurent Destailleur
a15cfd23f0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-13 22:57:51 +02:00
Laurent Destailleur
4a5fd35e11 Look and feel v8 2018-06-13 22:57:41 +02:00
Philippe GRAND
a937d9e657 clean code 2018-06-13 22:52:24 +02:00
Frédéric FRANCE
1bb25c6ce4 remove back quote 2018-06-13 22:26:12 +02:00
Laurent Destailleur
c5887c1ec7 Merge pull request #8399 from ptibogxiv/patch-23
FIX lang for support more type of stripeconnect account
2018-06-13 22:13:43 +02:00
Laurent Destailleur
e18717aa85 Update html.formprojet.class.php 2018-06-13 22:12:16 +02:00
Laurent Destailleur
933a6a5ba3 Update html.formcontract.class.php 2018-06-13 22:11:44 +02:00
Laurent Destailleur
094b31a563 Complete migration 2018-06-13 21:46:55 +02:00
Laurent Destailleur
ed41731a50 Merge pull request #8954 from mwelters/develop
German Accounting Plan SKR03 and SKR04 (mysql/data)
2018-06-13 21:45:02 +02:00
Laurent Destailleur
c09e69aeb6 Update llx_accounting_abc.sql 2018-06-13 21:44:43 +02:00
Laurent Destailleur
8d1456fb7f Merge pull request #8949 from atm-greg/Manage_product_units_in_supplier_proposal
add product units management in supplier proposal documents
2018-06-13 21:41:39 +02:00
Laurent Destailleur
aaa6565014 Merge pull request #8938 from HackLo/develop
FIX: Link does not work when there is spaces in SIREN
2018-06-13 21:39:54 +02:00
Laurent Destailleur
6881fda744 Merge pull request #8934 from grandoc/new_branch_08_06_2018
New branch 08 06 2018
2018-06-13 21:38:46 +02:00
Laurent Destailleur
074ada10e6 Merge pull request #8940 from aspangaro/8.0-b33
Fix : Migration for Romanian chart of accounts
2018-06-13 21:37:50 +02:00
Laurent Destailleur
09c92b7cc8 Merge pull request #8936 from atm-gauthier/6.0_fix_dont_remove_all_fourn_rights
FIX : If we enable 3 steps for supplier order approbation, we must no…
2018-06-13 21:36:01 +02:00
Laurent Destailleur
bc0080b945 Merge pull request #8945 from bafbes/abb7009
Fix: Do not activate module if errors found on execution of module SQL queries
2018-06-13 21:28:04 +02:00
Laurent Destailleur
98ae8e18df Update modMyModule.class.php 2018-06-13 21:27:57 +02:00
Laurent Destailleur
c586f2ecf7 Merge pull request #8957 from altatof/FIX_TOTAL_HT_DEVISE
FIX : pu_ht_devise was not converted to numeric so decimals were lost when calculating total_ht_devise
2018-06-13 21:20:42 +02:00