Commit Graph

69068 Commits

Author SHA1 Message Date
Laurent Destailleur
cefaeb583f Update xinputfile.modules.php 2019-02-28 11:24:43 +01:00
Laurent Destailleur
85d46a5270 Update xinputfile.modules.php 2019-02-28 11:24:07 +01:00
gauthier
1237a6d3e9 FIX : same thing here 2019-02-27 14:58:10 +01:00
gauthier
49e03b009f FIX : if empty error message, we just see "error" displayed 2019-02-27 14:50:01 +01:00
Laurent Destailleur
86e2ffe323 Merge pull request #10390 from glu000/8.0
Fix #10278
2019-02-27 02:24:55 +01:00
Laurent Destailleur
238894a7e4 Merge pull request #10624 from frederic34/patch-2
selectMulticurrency avoid malformed empty value
2019-02-27 02:06:24 +01:00
Laurent Destailleur
a48e9fdba4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-02-27 01:23:26 +01:00
Laurent Destailleur
c1fa48889e Merge pull request #10677 from frederic34/patch-6
fix #10385
2019-02-24 20:46:04 +01:00
Laurent Destailleur
6fdd0191f4 Merge pull request #10676 from frederic34/patch-5
fix #10656
2019-02-24 20:45:13 +01:00
Laurent Destailleur
2f300ae63f Standardize code with customer invoices 2019-02-24 20:26:54 +01:00
Laurent Destailleur
f41d504ba1 Merge pull request #10518 from atm-greg/8.0_FIX_bad_values_in_fourn_credit_note
FIX positive values IN supplier credit notes creating diff on addline rounding
2019-02-24 20:21:22 +01:00
Frédéric FRANCE
2ad91213b2 Update combinations.php 2019-02-24 12:09:57 +01:00
Frédéric FRANCE
ca2eba866c Update list.php 2019-02-24 11:56:17 +01:00
Frédéric FRANCE
435b416f93 fix #10656 2019-02-24 11:50:06 +01:00
Laurent Destailleur
4e19a83f1b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-02-23 16:01:38 +01:00
Laurent Destailleur
af6c482f26 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-02-23 16:01:30 +01:00
Laurent Destailleur
f2a73eecf2 Merge pull request #10645 from atm-gauthier/7.0_fix_feature_not_finished
FIX : function sendEmailsReminder isn't completely developed, then MA…
2019-02-23 15:01:44 +01:00
Laurent Destailleur
4c32aed2f4 Merge pull request #10650 from fappels/8.0_fix_dispatch
FIX fk_default_warehouse missing in group by
2019-02-23 14:08:28 +01:00
Francis Appels
c38b0c4dbe FIX fk_default_warehouse missing in group by 2019-02-22 12:17:34 +01:00
gauthier
58d82eb477 FIX : function sendEmailsReminder isn't completely developed, then MAIN_FEATURES_LEVEL must be 2 to "use" it 2019-02-21 11:08:55 +01:00
Laurent Destailleur
ad7b8371da FIX Mark credit note as available for credit note in other currency
Conflicts:
	htdocs/compta/paiement.php
	htdocs/core/class/discount.class.php
2019-02-18 18:30:15 +01:00
Frédéric FRANCE
b017213131 selectMulticurrency avoid malformed empty value 2019-02-17 20:59:39 +01:00
Laurent Destailleur
c0b22e86c2 Merge pull request #10619 from atm-gauthier/8.0_fix_cant_reopen_fourn_creditnote
FIX : we want to be able to reopen fourn credit note
2019-02-15 15:32:38 +01:00
gauthier
70f1a9d13d FIX : we want to be able to reopen fourn credit note 2019-02-15 11:41:02 +01:00
Laurent Destailleur
f456cc5e77 Merge pull request #10605 from hregis/8.0_mc
FIX missing $ismultientitymanaged for previous/next ref
2019-02-14 16:24:12 +01:00
Regis Houssin
45d05da6ed FIX missing $ismultientitymanaged for previous/next ref 2019-02-14 16:14:19 +01:00
Laurent Destailleur
c8b4265c12 Merge pull request #10602 from hregis/8.0_mc
FIX missing entity filter in function "build_filterField()" (export module)
2019-02-14 15:24:12 +01:00
Laurent Destailleur
2c2052d113 Update card.php
Avoid regression on restrictArea
2019-02-14 15:23:34 +01:00
Laurent Destailleur
4ac086ab70 Update info.php 2019-02-14 15:23:07 +01:00
Laurent Destailleur
173d28cf5a Update mouvement.php
Avoid regression on restrictArea
2019-02-14 15:22:22 +01:00
Laurent Destailleur
d2ee00d4bb Update security.lib.php
Avoid regression on test of restrictArea
2019-02-14 15:21:01 +01:00
Regis Houssin
359318392f FIX missing entity filter in function "build_filterField()" (export) 2019-02-14 10:47:07 +01:00
Regis Houssin
aa4c5ae839 FIX missing access security checking with multicompany 2019-02-14 10:12:15 +01:00
Laurent Destailleur
53a8f1cd3b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-02-12 13:36:05 +01:00
Laurent Destailleur
04b0216277 Merge pull request #10548 from aspangaro/7.0_accountancy_multicomp_movement
FIX: Accountancy - Add transaction with multicompany use only the first entity
2019-02-12 13:19:00 +01:00
Alexandre SPANGARO
2dc4edb68c FIX: Accountancy - Add transaction with multicompany use all the time 1st entity 2019-02-11 11:36:12 +01:00
Laurent Destailleur
43fbcf7081 Prepare 8.0.5 2019-02-08 10:28:59 +01:00
Laurent Destailleur
1c129a78ae Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-02-08 10:22:55 +01:00
Laurent Destailleur
679a13e48c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/expedition/class/expedition.class.php
2019-02-08 10:22:36 +01:00
Laurent Destailleur
3318baa664 Merge pull request #10522 from atm-ph/fix_8.0_crabe_payment_table
Fix display payment table on multiple pages
2019-02-08 10:08:46 +01:00
Laurent Destailleur
3d58e93a3c Merge pull request #10525 from atm-greg/8.0_FIX_supplier_proposal_lines_added_without_unit
FIX add fk_unit on addline action
2019-02-08 10:01:29 +01:00
Laurent Destailleur
4997b5968f Merge pull request #10506 from ATM-Marc/FIX_7.0_parent_line
FIX: line edit template: keep fk_parent_line
2019-02-08 09:52:21 +01:00
Laurent Destailleur
76b021d061 Merge pull request #10505 from ATM-Marc/FIX_7.0_expedition_status
FIX: expedition: reset status on rollback
2019-02-08 09:46:14 +01:00
Laurent Destailleur
92ef0d75cf Merge pull request #10504 from atm-quentin/FIX_supplier_invoice_paiement_credit_deposit
FIX supplier invoice payment total doesnnt care about deposit or credit
2019-02-08 09:44:42 +01:00
Laurent Destailleur
ccda5719cf Merge pull request #10503 from atm-quentin/FIX_product_stat_supplier_invoice
FIX supplier invoice product stats total ht is line total not invoice…
2019-02-08 09:43:38 +01:00
Laurent Destailleur
8abebb091c Var no more used 2019-02-08 09:33:01 +01:00
Laurent Destailleur
24955088de Merge pull request #10501 from hregis/8.0_mc
FIX [URGENT] broken feature, "$usercancreate" is for Dolibarr 9
2019-02-08 09:31:26 +01:00
Laurent Destailleur
e5d7a862b4 Merge pull request #10527 from atm-ph/fix_8.0_psql_search_insensitive_accent
Fix psql search insensitive accent
2019-02-08 09:29:59 +01:00
Laurent Destailleur
bd3f0da19c Merge pull request #10515 from atm-gauthier/8.0_fix_can_addline_on_invoices
FIX : can't add lines on invoices
2019-02-08 09:27:51 +01:00
Laurent Destailleur
0ac995b37c Merge pull request #10512 from atm-florian/8.0
fix php warning
2019-02-08 09:27:18 +01:00