From a91a96e72ee6d9205bd8dbee50b4e1feeb6d2ffb Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Mon, 10 Dec 2012 10:02:13 +0100 Subject: [PATCH] merge --- ChangeLog | 1 + htdocs/.gitignore | 1 + htdocs/adherents/card_subscriptions.php | 34 +- htdocs/compta/ajaxpayment.php | 4 +- htdocs/compta/facture.php | 35 +- htdocs/compta/paiement.php | 86 ++- .../compta/paiement/class/paiement.class.php | 12 +- htdocs/compta/paiement/liste.php | 10 +- htdocs/compta/resultat/index.php | 13 +- htdocs/compta/stats/index.php | 3 +- htdocs/core/lib/price.lib.php | 568 +++++++++--------- .../modules/facture/doc/pdf_crabe.modules.php | 18 +- htdocs/includes/tcpdf/CHANGELOG.TXT | 67 +++ htdocs/includes/tcpdf/README.TXT | 4 +- htdocs/includes/tcpdf/barcodes.php | 10 +- htdocs/includes/tcpdf/composer.json | 38 ++ htdocs/includes/tcpdf/config/tcpdf_config.php | 2 +- .../tcpdf/config/tcpdf_config_alt.php | 2 +- htdocs/includes/tcpdf/datamatrix.php | 157 ++--- htdocs/includes/tcpdf/fonts/cid0cs.php | 16 + htdocs/includes/tcpdf/fonts/cid0ct.php | 16 + htdocs/includes/tcpdf/fonts/cid0jp.php | 16 + htdocs/includes/tcpdf/fonts/cid0kr.php | 16 + htdocs/includes/tcpdf/fonts/uni2cid_ac15.php | 6 + htdocs/includes/tcpdf/fonts/uni2cid_ag15.php | 6 + htdocs/includes/tcpdf/fonts/uni2cid_aj16.php | 6 + htdocs/includes/tcpdf/fonts/uni2cid_ak12.php | 6 + htdocs/includes/tcpdf/tcpdf.php | 480 +++++++++++---- .../install/mysql/data/llx_10_c_regions.sql | 14 + .../mysql/data/llx_20_c_departements.sql | 69 +++ .../mysql/data/llx_c_forme_juridique.sql | 11 + .../install/mysql/migration/3.2.0-3.3.0.sql | 2 +- .../tables/llx_accounting_system.key.sql | 2 +- htdocs/langs/en_US/banks.lang | 1 + htdocs/langs/en_US/bills.lang | 7 + htdocs/langs/en_US/compta.lang | 6 +- htdocs/langs/fr_FR/banks.lang | 1 + htdocs/langs/fr_FR/bills.lang | 10 +- htdocs/langs/fr_FR/compta.lang | 6 +- htdocs/langs/fr_FR/main.lang | 2 +- htdocs/langs/ja_JP/main.lang | 7 +- htdocs/user/class/user.class.php | 2 +- test/phpunit/BuildDocTest.php | 51 +- 43 files changed, 1252 insertions(+), 572 deletions(-) create mode 100644 htdocs/includes/tcpdf/composer.json create mode 100644 htdocs/includes/tcpdf/fonts/cid0cs.php create mode 100644 htdocs/includes/tcpdf/fonts/cid0ct.php create mode 100644 htdocs/includes/tcpdf/fonts/cid0jp.php create mode 100644 htdocs/includes/tcpdf/fonts/cid0kr.php create mode 100644 htdocs/includes/tcpdf/fonts/uni2cid_ac15.php create mode 100644 htdocs/includes/tcpdf/fonts/uni2cid_ag15.php create mode 100644 htdocs/includes/tcpdf/fonts/uni2cid_aj16.php create mode 100644 htdocs/includes/tcpdf/fonts/uni2cid_ak12.php diff --git a/ChangeLog b/ChangeLog index 8fd47651f99..308b1704819 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ For users: - New: Add field "signature" into thirdparty card. If filled, text is added at end of predefined email texts. If option MAIL_DO_NOT_USE_SIGN is on, this feature is disabled. +- New: Can input a payment back onto an credit note. - New: Add link "Back to list" on all cards. - New: After first install, warning are visible onto mandatory setup not configured. Show also total number of activated modules. diff --git a/htdocs/.gitignore b/htdocs/.gitignore index 462109fff42..dfa990ed38c 100644 --- a/htdocs/.gitignore +++ b/htdocs/.gitignore @@ -1,3 +1,4 @@ /test.php /custom* /bootstrap +/multicompany diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index 5c278dd66f3..6303751dfe5 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -744,19 +744,31 @@ if ($rowid) print_fiche_titre($langs->trans("NewCotisation")); - $bankdirect=0; // Option to write to bank is on by default - $bankviainvoice=0; // Option to write via invoice is on by default - $invoiceonly=0; - if (! empty($conf->banque->enabled) && $conf->global->ADHERENT_BANK_USE && (empty($_POST['paymentsave']) || $_POST["paymentsave"] == 'bankdirect')) $bankdirect=1; - if (! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled) && $object->fk_soc) $bankviainvoice=1; + // Define default choice to select + $bankdirect=0; // 1 means option by default is write to bank direct with no invoice + $invoiceonly=0; // 1 means option by default is invoice only + $bankviainvoice=0; // 1 means option by default is write to bank via invoice + if (GETPOST('paymentsave')) + { + if (GETPOST('paymentsave') == 'bankdirect') $bankdirect=1; + if (GETPOST('paymentsave') == 'invoiceonly') $invoiceonly=1; + if (GETPOST('paymentsave') == 'bankviainvoice') $bankviainvoice=1; + } + else + { + if (! empty($conf->global->ADHERENT_BANK_USE) && ! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled) && $object->fk_soc) $bankviainvoice=1; + else if (! empty($conf->global->ADHERENT_BANK_USE) && ! empty($conf->banque->enabled)) $bankdirect=1; + else if (empty($conf->global->ADHERENT_BANK_USE) && ! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled) && $object->fk_soc) $invoiceonly=1; + } print "\n\n\n"; if ($conf->use_javascript_ajax) { + //var_dump($bankdirect.'-'.$bankviainvoice.'-'.$invoiceonly.'-'.empty($conf->global->ADHERENT_BANK_USE)); print "\n".'