Commit Graph

61699 Commits

Author SHA1 Message Date
Laurent Destailleur
f3003fa542
Merge pull request #8713 from atm-greg/Fix_supplierinvoice_line_Rank_handling
FIX addline on invoice supplier manage rank on its own if not provided
2018-05-02 18:24:17 +02:00
atm-greg
942e2f40bf addline manage rank on its own if not provided 2018-05-02 17:07:27 +02:00
Laurent Destailleur
5c024ceb54 Merge 2018-05-01 12:49:21 +02:00
Laurent Destailleur
82708705c7
Merge pull request #8701 from Dolibarr/revert-8354-5.0_multicurrency_objectline_print
Revert "No display object line curreny if not necessary"
2018-05-01 11:17:59 +02:00
Laurent Destailleur
d975dd507b
Revert "No display object line curreny if not necessary" 2018-05-01 11:17:47 +02:00
Laurent Destailleur
b1f1ddc6d0
Merge pull request #8354 from tuxgasy/5.0_multicurrency_objectline_print
No display object line curreny if not necessary
2018-05-01 11:15:31 +02:00
Laurent Destailleur
ab85fa8721 Backport EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS to solve blocking
situation.
2018-04-30 17:45:34 +02:00
Laurent Destailleur
e5df7e206b
Merge pull request #8224 from atm-ph/fix_6.0_supplier_order_from_supplier_proposal
Fix wrong price on supplier order line
2018-04-27 12:20:49 +02:00
Laurent Destailleur
d179cafa9c
Update fournisseur.commande.class.php 2018-04-27 12:19:32 +02:00
Laurent Destailleur
ecd84f6c45
Update fournisseur.commande.class.php 2018-04-27 12:18:45 +02:00
Laurent Destailleur
4c87cbf644
Update card.php 2018-04-27 12:14:51 +02:00
Laurent Destailleur
e18190565c
Merge pull request #8683 from ATM-Marc/FIX_export_actioncomm
FIX: actioncomm export: type filtering not working
2018-04-27 11:38:59 +02:00
Marc de Lima Lucio
c044d9ab58 FIX: actioncomm export: type filtering not working 2018-04-25 16:20:09 +02:00
Laurent Destailleur
e1585ef7e3
Merge pull request #8640 from atm-florian/6.0
fix : use template at the goos place for generate doc for supplier
2018-04-20 01:23:44 +02:00
florian HENRY
882863ab48 fix : define in conf dir_output for suipplier_proposal modules 2018-04-18 16:21:20 +02:00
florian HENRY
bf27ca1b11 fix : use template at the goos place for generate doc for supplier
propoal
2018-04-18 16:00:37 +02:00
Laurent Destailleur
e4635c9401 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-18 00:01:40 +02:00
Laurent Destailleur
c7789d2038 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-18 00:01:06 +02:00
Laurent Destailleur
11897976c3
Merge pull request #8625 from hregis/6.0_multicompany
Fix: missing drop index with postgresql
2018-04-17 18:52:45 +02:00
Laurent Destailleur
1870598734
Merge pull request #8627 from hregis/5.0_bug
Fix: syntax error for postgresql > 9.1
2018-04-17 18:51:55 +02:00
Regis Houssin
9a210c1a91 Fix: syntax error for postgresql > 9.1 2018-04-17 17:33:40 +02:00
Regis Houssin
dd835c4868 Fix: missing drop index with postgresql 2018-04-17 17:18:59 +02:00
Laurent Destailleur
bcecc25401
Merge pull request #8606 from atm-greg/Add_hooks_on_supplier_docs
add hooks on supplier documents
2018-04-17 09:43:51 +02:00
atm-greg
90f1ab8af4 add hooks on supplier documents 2018-04-16 06:46:22 +02:00
Laurent Destailleur
64dafbc37f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-15 11:33:40 +02:00
Laurent Destailleur
37e4da30d0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-15 11:33:27 +02:00
Laurent Destailleur
e29476428c
Merge pull request #8594 from hregis/6.0_multicompany
FIX project category is type 6 not 5 !!
2018-04-15 11:32:49 +02:00
Laurent Destailleur
6b3c17680f
Merge pull request #8596 from simnandez/5.0
FIX: some localtaxes errors
2018-04-15 11:25:27 +02:00
Juanjo Menent
bfed1b9db1 FIX: some localtaxes errors 2018-04-14 12:45:40 +02:00
Regis Houssin
79c34f4d69 Fix: project category is type 6 not 5 !! 2018-04-14 10:03:21 +02:00
Laurent Destailleur
50a3b73a6f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-13 23:21:29 +02:00
Laurent Destailleur
3ec295935c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-13 23:21:18 +02:00
Laurent Destailleur
ecdb56606d
Merge pull request #8590 from atm-greg/FIX_supplier_invoice_line_rank
Rank of invoice_supplier lines was always -1
2018-04-13 23:20:42 +02:00
Laurent Destailleur
e1bd605604
Merge pull request #8587 from atm-greg/Fix_specialcode_on_supplier_doc_lines
Fix specialcode on order_supplier doc lines
2018-04-13 22:24:04 +02:00
atm-greg
4fae1e3236 rank of invoice_supplier lines was always -1 2018-04-13 17:01:10 +02:00
atm-greg
8d4126274a rang was missing on order_supplier lines 2018-04-13 15:53:49 +02:00
atm-greg
ef2c6a0ed4 fix sql error 2018-04-13 10:31:36 +02:00
atm-greg
58535993c1 use special_code on order_supplier lines 2018-04-13 10:31:27 +02:00
Laurent Destailleur
7bf9801b80
Merge pull request #8577 from atm-florian/6.0
fix error on first install pgsql
2018-04-12 23:47:10 +02:00
florian HENRY
cd2f6616be fix index creation with unique name for pgSQL 2018-04-12 16:41:53 +02:00
florian HENRY
def28be0ab fix error on first install pgsql 2018-04-12 16:36:04 +02:00
Laurent Destailleur
eec99b436e
Merge pull request #8565 from atm-greg/Add_supplierContactName_on_documents
Add supplier contact name on supplier documents
2018-04-11 19:25:01 +02:00
Laurent Destailleur
0f3d2cc8df
Merge pull request #8564 from atm-ph/fix_6.0_sellsjournal_situation_invoice
Fix wrong amount for situation invoice in sellsjournal
2018-04-11 17:51:00 +02:00
atm-greg
ae34fa6fbd add supplier contact name on supplier documents 2018-04-11 17:42:26 +02:00
Laurent Destailleur
d7da83ebc5
Merge pull request #8560 from atm-john/Fix_extrafield_list_from_table_entity
Fix extrafield entity query filter
2018-04-11 17:31:36 +02:00
Laurent Destailleur
9fafefa0d7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-11 17:18:09 +02:00
Laurent Destailleur
0518218aed Fix regression 2018-04-11 17:17:03 +02:00
atm-ph
6f526eb780 Fix wrong amount for situation invoice in sellsjournal 2018-04-11 16:40:59 +02:00
Laurent Destailleur
b732844e91
Merge pull request #8537 from atm-arnaud/FIX_8023_missing_escape_htmltag
FIX #8023
2018-04-11 16:25:33 +02:00
Laurent Destailleur
628b437e28
Update card.php 2018-04-11 16:25:05 +02:00