lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
55,836 Commits 43 Branches 150 Tags 886 MiB
4.0
Commit Graph

6393 Commits

Author SHA1 Message Date
Laurent Destailleur
24c91933d0 Work on select fields for orders, invoices and shipments 2016-04-08 01:00:02 +02:00
Laurent Destailleur
b1c2198154 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/ajax/selectsearchbox.php
	htdocs/core/lib/price.lib.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFacture.class.php
	htdocs/projet/list.php
	htdocs/societe/list.php
 2016-04-07 20:01:52 +02:00
Laurent Destailleur
39b61d6924 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/boxes/box_task.php
	htdocs/core/lib/files.lib.php
 2016-04-07 19:27:53 +02:00
Christophe Battarel
d052eac6fc NEW: add product type filter on turnover report 2016-04-07 14:57:41 +02:00
Laurent Destailleur
086345490d Generalize the set of trackid for everyemail sent by dolibarr. 2016-04-07 14:29:07 +02:00
Laurent Destailleur
1a1dc39a6b Mark a duplicate function as deprecated 2016-04-06 14:53:14 +02:00
aspangaro
a85575a93c Merge remote-tracking branch 'Upstream/develop' into 4.0-p16 2016-04-04 05:31:12 +02:00
aspangaro
c6aabd3f34 NEW: Move HRM area page in HRM directory 2016-04-04 05:29:12 +02:00
Ion Agorria
fbe0414a1f Change FactureRec superclass CommonInvoice 2016-04-03 21:02:19 +02:00
Juanjo Menent
314069f1da Qual: Remove unused function 2016-04-03 15:47:07 +02:00
Juanjo Menent
305bbf1450 Fix Doc 2016-04-03 12:39:39 +02:00
Juanjo Menent
e8b2d6baab NEW #3510 : Working 2016-04-03 12:22:18 +02:00
Juanjo Menent
9d189b3c04 NEW #3510 : Working 2016-04-03 12:14:51 +02:00
Juanjo Menent
d55d12baeb NEW #3510 : Working 2016-04-03 11:56:31 +02:00
Laurent Destailleur
e1bec46a34 FIX The include file for action on files should not be a template file 
but an action include file.
 2016-04-02 14:16:16 +02:00
Frédéric FRANCE
d4529d19c7 Update facture.php 
ref_client in order
ref_customer in shipping
 2016-04-01 17:32:58 +02:00
Laurent Destailleur
e40b678d7b Uniformize code 2016-04-01 16:29:47 +02:00
Laurent Destailleur
97b5026ad8 Uniformize code and css 2016-04-01 16:18:45 +02:00
Laurent Destailleur
27ed9ba3da Remove now link useless here 2016-04-01 12:13:43 +02:00
Laurent Destailleur
2d9c53fc26 NEW Merge all boxes "related objects" into one. This save a lot of room 
on most card and avoid often horizontal scoll.
 2016-03-30 19:18:31 +02:00
Juanjo Menent
dc491fbae9 Merge pull request #4887 from defrance/patch-111 
NEW : INVOICE_CAN_NEVER_BE_CANCELED global
 2016-03-26 09:51:36 +01:00
BENKE Charlie
767ce063df Change done 2016-03-25 18:16:05 +01:00
Laurent Destailleur
6a58b025f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-25 18:10:50 +01:00
Laurent Destailleur
bc1b2d048b Uniformise option name 2016-03-25 18:09:42 +01:00
Laurent Destailleur
f61f1c7a27 Merge pull request #4857 from marcosgdf/bankacc-misc 
Little refactor
 2016-03-25 17:43:56 +01:00
Laurent Destailleur
30aea901b8 Merge pull request #4855 from marcosgdf/account-oop 
NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country
 2016-03-25 17:41:39 +01:00
Laurent Destailleur
a0563b410e Merge remote-tracking branch 'origin/3.9' into develop 2016-03-25 16:24:26 +01:00
Laurent Destailleur
884ba3a0ba Fix bad hook function name 2016-03-25 16:23:09 +01:00
Laurent Destailleur
a2d6cf8549 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-25 16:17:17 +01:00
Laurent Destailleur
9ddae7d7f3 Fix bad hook function name 2016-03-25 16:17:01 +01:00
Laurent Destailleur
7ca1e27103 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-25 16:15:54 +01:00
Laurent Destailleur
f251ca579b Fix bad hook function name 2016-03-25 16:15:35 +01:00
Laurent Destailleur
ea9db792be Merge remote-tracking branch 'origin/3.9' into develop 2016-03-25 16:14:37 +01:00
Laurent Destailleur
7430d09739 Fix bad hook function name 2016-03-25 16:13:22 +01:00
Laurent Destailleur
85cd0038f5 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-25 16:10:10 +01:00
Laurent Destailleur
5e55f0ecce Fix bad function name into hook 2016-03-25 16:07:42 +01:00
Laurent Destailleur
61bc8fc9ef NEW Can edit value date of a vat payment after recording it. 
Conflicts:
	htdocs/compta/localtax/card.php
	htdocs/core/class/html.form.class.php
 2016-03-25 16:01:45 +01:00
Juanjo Menent
aa9a39cab5 NEW #3510 : Standardize module 2016-03-25 15:59:44 +01:00
Laurent Destailleur
e30d717e00 Uniformize look 2016-03-25 15:56:27 +01:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function" 
This reverts commit 87cd6e1e40.
 2016-03-25 15:34:37 +01:00
Laurent Destailleur
8ecfca5a9e Revert change that break compatiblity with 100% of modules 2016-03-25 15:26:46 +01:00
Laurent Destailleur
26de415b77 Revert commit that break compatibility of 100% of modules 2016-03-25 15:24:57 +01:00
Laurent Destailleur
46613cd72b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-25 14:50:00 +01:00
Laurent Destailleur
4ec41bc33b NEW Can edit value date of a vat payment after recording it. 2016-03-25 14:49:48 +01:00
Laurent Destailleur
bdead30e75 FIX Missing function 2016-03-25 14:42:16 +01:00
BENKE Charlie
54af96b21b Add : BILL_NEVER_BE_CANCELED 
In some case we don't want to allow cancel bill, forced to made an avoir
 2016-03-24 11:38:05 +01:00
Juanjo Menent
922c57da76 NEW #3510 : Standardize module 2016-03-23 22:45:04 +01:00
Laurent Destailleur
612aa0ab04 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-22 15:50:56 +01:00
Laurent Destailleur
f686ef1d04 Uniformize look 2016-03-22 15:50:35 +01:00
Marcos García de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
ff6b187ef3 NEW Converted Form::showLinkedObjectBlock to a static function 2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
4d78932fe8 NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions 2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15:17 +01:00
Marcos García de La Fuente
889c72611d NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown 2016-03-19 23:00:33 +01:00
Marcos García de La Fuente
59bfac65aa Little refactor 2016-03-19 20:48:37 +01:00
Marcos García de La Fuente
1be9c53b6c NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country 2016-03-19 19:39:18 +01:00
Laurent Destailleur
ba4f5c8648 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-19 19:26:57 +01:00
Laurent Destailleur
ee857055be Merge remote-tracking branch 'origin/3.8' into 3.9 2016-03-19 19:26:25 +01:00
Laurent Destailleur
660f825a34 Fix regression description line not visible 2016-03-19 19:25:28 +01:00
Laurent Destailleur
4436ec954f Merge remote-tracking branch 'origin/3.8' into 3.9 2016-03-19 19:15:23 +01:00
Laurent Destailleur
f0eb8ac794 Fix regression Product ref not visible 2016-03-19 19:13:27 +01:00
Laurent Destailleur
558d03c371 Add the "now" link on date to pay vat 2016-03-18 19:44:40 +01:00
Laurent Destailleur
b4e775dd35 FIX Parsing of amount to pay vat 2016-03-18 19:42:56 +01:00
Laurent Destailleur
5eef373ed6 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/compta/bank/search.php
	htdocs/user/card.php
 2016-03-18 14:56:44 +01:00
Laurent Destailleur
c5e744bfc2 FIX #4839 2016-03-18 12:16:40 +01:00
Laurent Destailleur
2b1f57f01e Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	dev/initdata/savedemo.sh
	htdocs/filefunc.inc.php
	htdocs/user/card.php
 2016-03-18 11:54:14 +01:00
Laurent Destailleur
7fa71214bc Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
	htdocs/core/modules/commande/doc/pdf_proforma.modules.php
 2016-03-18 11:06:41 +01:00
Laurent Destailleur
08c5fd2e36 FIX #4809 - Duplicate functions with different content 2016-03-14 14:38:30 +01:00
Laurent Destailleur
619ebf9a3e Enhance css of search fields 2016-03-13 20:38:16 +01:00
Laurent Destailleur
543f5cef63 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	dev/initdata/initdemo.sh
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
 2016-03-13 01:31:12 +01:00
Laurent Destailleur
a5571b1040 NEW Show a badge with number of withdraw requests done on the withdraw 
tab of invoice.
 2016-03-13 01:20:54 +01:00
Laurent Destailleur
f345ff7300 Fix regression on vat calculation when invoice was not a situation 
invoice
 2016-03-13 01:11:42 +01:00
Laurent Destailleur
1b30c1adb4 Fix regression on vat calculation when invoice was not a situation 
invoice
 2016-03-12 20:49:38 +01:00
Laurent Destailleur
e0809fc750 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	ChangeLog
	build/makepack-dolibarr.pl
	htdocs/compta/facture.php
	htdocs/product/document.php
 2016-03-12 18:40:50 +01:00
Laurent Destailleur
368b4c621f Fix phpcs 2016-03-12 18:25:41 +01:00
Laurent Destailleur
dca5e5278b Merge pull request #4736 from marcosgdf/bankcateg-oop 
NEW Moved code that deals with bank categories to BankCateg. Created BankCateg::fetchAll function
 2016-03-12 12:01:32 +01:00
Laurent Destailleur
8cdc80bfb4 Merge pull request #4787 from grandoc/develop 
[Qal] uniformize code
 2016-03-12 11:52:57 +01:00
Laurent Destailleur
7c950be468 Fix Phpcs 2016-03-11 18:04:45 +01:00
Regis Houssin
f87bb1206e Fix: wrong fk_parent_line in credit note with invoiceAvoirWithLines 
option
 2016-03-11 15:42:14 +01:00
Laurent Destailleur
8b16a76936 Avoid duplicate translation 2016-03-11 10:59:28 +01:00
Marcos García de La Fuente
39f915d95d Reverted use of BankCateg in Bank category listing 2016-03-10 19:52:27 +01:00
philippe grand
b495fdb58e [Qal] uniformize code 2016-03-10 15:51:31 +01:00
Laurent Destailleur
ecf47109c0 Merge pull request #4739 from marcosgdf/accountline-oop 
NEW Created AccountLine::insert function and started using it for transaction creation
 2016-03-10 13:55:07 +01:00
Laurent Destailleur
79989c2f65 Merge pull request #4741 from marcosgdf/account-oop-properties 
Fixed wrong Account class property used in bank/card.php
 2016-03-10 13:53:17 +01:00
Laurent Destailleur
21bf8824b9 Merge pull request #4738 from marcosgdf/account-libstatut 
Refactored Account::libStatut and added object typehinting to some functions of Account class
 2016-03-10 13:29:02 +01:00
Laurent Destailleur
4fa84c8d8f Merge pull request #4707 from marcosgdf/misc2 
Removed deprecated usage of Account::account_currency_code and started using Account::canBeReconciliated
 2016-03-10 13:21:51 +01:00
Laurent Destailleur
5bd5323c93 Finished to move the mergepdftool dedicated page into the generic "mass 
actions" feature.
 2016-03-10 12:11:11 +01:00
Laurent Destailleur
09a29322c3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/orderstoinvoice.php
	htdocs/public/demo/index.php
	htdocs/societe/commerciaux.php
 2016-03-08 17:40:21 +01:00
Marcos García de La Fuente
08d27b7148 Refactored Account::LibStatut function 2016-03-07 11:31:16 +01:00
Marcos García de La Fuente
66f71d16d9 Fixed wrong Account class property used in bank/card.php 2016-03-06 19:59:37 +01:00
Laurent Destailleur
3dbe27030e FIX If all banks account are reconcilable to off, we must not show nb of 
transactions to reconciles.
FIX Switching status reconcile on-off was broken.
 2016-03-06 12:39:59 +01:00
Marcos García de La Fuente
ed51a42963 NEW Created AccountLine::insert function and started using it for transaction creation 2016-03-05 16:26:30 +01:00
Marcos García de La Fuente
4f569279d6 Refactored Account::libStatut and added object typehinting to some functions of Account class 2016-03-05 16:14:41 +01:00
Marcos García de La Fuente
0fd9518ad0 NEW Moved code that deals with bank categories to BankCateg. Created BankCateg::fetchAll function 
Also replaced spaces with tabs and applied PSR-2 beautifier to the code
 2016-03-05 15:51:02 +01:00
Laurent Destailleur
d1777a6783 Replace function rand with mt_rand (prepare php 8) 2016-03-05 15:01:25 +01:00
Marcos García de La Fuente
6184c71181 Corrected comparison of Account::canBeConciliated output 2016-03-05 14:05:00 +01:00
Laurent Destailleur
446a080c75 NEW Mutualize code to manage email substitution variables. Show 
available variables into page to edit email templates.
 2016-03-05 12:20:58 +01:00
Laurent Destailleur
cbd102fa45 Merge and rename method into camel format 2016-03-04 16:28:38 +01:00
Laurent Destailleur
87093c79f9 Merge pull request #4708 from marcosgdf/account-constants 
Started using Account TYPE and STATUS constants
 2016-03-04 16:23:50 +01:00
Laurent Destailleur
453466f23f Fix draft invoice must be destroyed once converted into template 2016-03-03 21:14:20 +01:00
Laurent Destailleur
40144eee8d NEW linked object can show now the recurring invoices with other linked 
objects.
 2016-03-03 13:38:16 +01:00
Laurent Destailleur
3cbeca26e7 NEW When creating a template invoice from a draft invoice, if there is 
link to contract on draft invoice, link is kept on template invoice.
 2016-03-03 13:16:46 +01:00
Laurent Destailleur
d842d05639 Fix bug in date compare 2016-03-03 12:31:29 +01:00
Laurent Destailleur
fd2166ed11 Minor enhancement on new recurring invoice generation 2016-03-03 10:42:49 +01:00
Laurent Destailleur
3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
 2016-03-02 23:40:11 +01:00
Laurent Destailleur
3b70bbb05a Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/admin.lib.php
 2016-03-02 23:07:42 +01:00
Marcos García de La Fuente
6f5481896b FIX #4453 SEPA Direct Debit generated XML shows a trailing comma in RmtInf field 
Close #4453
 2016-03-02 12:41:24 +01:00
Marcos García de La Fuente
ff83dd9afe Replaced account type comparisons with TYPE constants 2016-03-02 11:08:57 +01:00
Marcos García de La Fuente
dcde7773a3 Started using Account TYPE and STATUS constants 2016-03-02 11:04:52 +01:00
Marcos García de La Fuente
66313f584b Removed deprecated usage of Account::account_currency_code and started using Account::canBeReconciliated 2016-03-02 10:52:54 +01:00
Marcos García de La Fuente
e646f28c0a Documented properties of Account class 2016-03-01 15:46:06 +01:00
Frédéric FRANCE
10d04e63c1 Update bonprelevement.class.php 2016-02-29 22:59:08 +01:00
Laurent Destailleur
846d78dfba FIX Edition of delay (nb of days) for payment term "Immediate" was 
broken.
 2016-02-29 15:43:00 +01:00
Laurent Destailleur
21c7aacddb Fix add hidden option INVOICE_DEFAULT_UNPAYED_SORT_ORDER to be able to 
provide backward compatibility with old behaviour.
 2016-02-29 10:29:32 +01:00
Laurent Destailleur
5453f99e2e Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/comm/prospect/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
 2016-02-27 18:33:39 +01:00
Laurent Destailleur
8807222f24 Fix a lot of fixes to have the french vat npr working better 2016-02-27 12:22:39 +01:00
Laurent Destailleur
c86a1a30d5 Fix a lot of fixes to have the french vat npr working better 2016-02-27 11:46:16 +01:00
Laurent Destailleur
4cf59d3f9b Fix if option WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER is on, we must 
not show unpaid orders.
 2016-02-26 19:13:25 +01:00
Laurent Destailleur
23f45c7b7e Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/commande/list.php
	htdocs/core/lib/pdf.lib.php
 2016-02-26 15:45:25 +01:00
fmarcet
30d6aa0b96 FIX: Some filters are lost when paging 2016-02-26 13:14:23 +01:00
Laurent Destailleur
7567336680 FIX #4683 2016-02-26 10:51:06 +01:00
Laurent Destailleur
8927948bef NEW Add option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN 2016-02-25 16:27:28 +01:00
Laurent Destailleur
773e5e3b0a Fix: specific contact of object were lost when used to create invoice. 2016-02-25 01:03:37 +01:00
Laurent Destailleur
191394bf88 Fix: specific contact of object were lost when used to create invoice. 2016-02-25 01:02:11 +01:00
phf
fd4cda819c New add supplier payment 2016-02-21 22:47:52 +01:00
phf
d320aebe82 Fix muticurrency attributs not declared in class PropalLine 
Fix fetch_lines of FactureFournisseur with multicurrency fields
 2016-02-19 22:41:47 +01:00
Laurent Destailleur
9c8d69eaa9 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2016-02-19 04:46:11 +01:00
Laurent Destailleur
03c3eb88d0 Merge pull request #4640 from atm-ph/fix_multicurrency_require 
Fix replace dol_include_once() function by require_once for internal module
 2016-02-19 02:50:05 +01:00
Laurent Destailleur
52c82508e4 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/compta/charges/index.php
 2016-02-18 23:27:57 +01:00
Laurent Destailleur
6b9d7763fe Clean code for adding a link to a related object 2016-02-16 22:26:23 +01:00
phf
6d095fce9f Fix replace dol_include_once() function by require_once for internal module 2016-02-16 20:44:23 +01:00
Laurent Destailleur
9796b1b268 Can select number of records into lists 2016-02-16 17:43:05 +01:00
Laurent Destailleur
9d418bca7f Merge branch 'new_add_customer_multicurrency_payment' of 
https://github.com/atm-ph/dolibarr into
atm-ph-new_add_customer_multicurrency_payment

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-16 15:06:39 +01:00
Laurent Destailleur
c78997ed23 Tons of fixes and enhancement on recurring invoice generation 2016-02-16 00:31:05 +01:00
phf
86c8998742 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_add_customer_multicurrency_payment 
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-15 20:53:06 +01:00
Laurent Destailleur
9cbbf07351 Add fields to link recurring invoice lines with contract origin when it 
comes from this.
 2016-02-15 16:13:33 +01:00
Laurent Destailleur
d715345c82 Debug 2016-02-15 15:07:57 +01:00
Laurent Destailleur
38f7ac29d7 Show vat of lines on template invoices 2016-02-15 14:49:06 +01:00
Laurent Destailleur
23afb80c82 Can remove status recurring or not of template invoice 2016-02-15 14:42:05 +01:00
Laurent Destailleur
f1f5c48337 Uniformize code 2016-02-15 14:27:35 +01:00
Laurent Destailleur
d4c3258385 Fix missing field 
Fix bad value for default value of next date
 2016-02-15 07:36:45 +01:00
aspangaro
d4057c3feb Fixed: Correct problem of rights beetween tax and salaries module 2016-02-15 06:56:51 +01:00
Laurent Destailleur
7aaae143fc Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/expedition/card.php
 2016-02-15 02:01:58 +01:00
Laurent Destailleur
e1d713738f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-15 01:03:09 +01:00
Laurent Destailleur
632080855b Merge pull request #4622 from frederic34/patch-10 
NEW Show link of bank receipt into bank transation list
 2016-02-15 01:02:31 +01:00
Laurent Destailleur
c1c8ead49f Debug multicurrency module 2016-02-15 00:58:51 +01:00
Laurent Destailleur
e8bc88fffe Merge branch 'new_recurring_invoice' of 
https://github.com/atm-ph/dolibarr into atm-ph-new_recurring_invoice

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-15 00:45:39 +01:00
Frédéric FRANCE
5841055d9a Update releve.php 2016-02-14 22:53:00 +01:00
Frédéric FRANCE
e7a7909b9d Update rappro.php 2016-02-14 12:16:17 +01:00
phf
4f6289bea0 Fix test if frequency is defined to create or not by the cron 2016-02-12 16:09:50 +01:00
phf
428a7e7042 FIX remove comment, calcul next date for recurring invoice, increment nb_gen_done 2016-02-12 15:55:55 +01:00
phf
c4812abd62 Fix can update fields of facture rec 
Fix create invoice from facture rec don't get all properties and add fk_account
 2016-02-12 12:31:43 +01:00
Laurent Destailleur
bc33b19d7d NEW Can change dynamically number of records visible into lists. 2016-02-11 20:24:15 +01:00
Laurent Destailleur
518080468e Fix button create template must be visible only if amount is != 0 2016-02-11 10:39:01 +01:00
phf
875e01aeee New add recurrence fields on create form of invoice model 
Fix missing fields in database about multicurrency
 2016-02-11 09:50:35 +01:00
phf
a0cfe9aad8 New add payment with multicurrency module 2016-02-10 23:16:38 +01:00
Laurent Destailleur
9b41e11a1e NEW Can select dynamicaly number of lines to show on page 2016-02-10 20:48:18 +01:00
Laurent Destailleur
f640bf7c61 Manage the reply-to field into mail libs 2016-02-09 11:56:12 +01:00
Laurent Destailleur
d89daf9cd2 Work to move the merge pdf tool into the mass action combo of lists 2016-02-08 18:04:42 +01:00
Laurent Destailleur
d2708a4225 Merge pull request #4475 from atm-ph/new_multicurrency_module 
New multicurrency module
 2016-02-08 14:44:49 +01:00
Laurent Destailleur
81aae30253 NEW Add a checkbox to select/unselect all lines on page that support 
mass actions (like invoice list page)
 2016-02-07 19:55:41 +01:00
Laurent Destailleur
9da0164d90 Uniformize code for lists 2016-02-07 15:50:48 +01:00
Laurent Destailleur
efc2eeea83 Uniformize code for filters on payments 2016-02-07 14:41:06 +01:00
Laurent Destailleur
c1a6a2880b Debug numbering module for customer payment 2016-02-07 14:22:52 +01:00
Laurent Destailleur
8f8c63e9c8 FIX Delete triggers must be before delete (reverse order compared to 
create)
 2016-02-06 12:37:48 +01:00
phf
1b552a0b3b Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module 
Conflicts:
	htdocs/core/class/link.class.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-03 18:30:59 +01:00
Laurent Destailleur
47e2e33fb7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/menus/init_menu_auguria.sql
 2016-02-03 03:27:17 +01:00
Laurent Destailleur
f4d04b8f26 FIX part of #4227 2016-02-03 02:41:07 +01:00
Laurent Destailleur
6f1ddd3ba4 Fix on ref not correctly initialized. 2016-02-03 02:29:19 +01:00
Laurent Destailleur
c28c8d5d18 Add more info into log 2016-02-02 16:32:47 +01:00
Florian HENRY
72b0f62089 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-01 15:00:09 +01:00
fmarcet
acc9879c7c FIX: It doesn't check if there is enough stock to update the lines of orders/invoices 2016-02-01 13:05:14 +01:00
Laurent Destailleur
2d0c823ffe Fix bad transaction level due to code of situation invoices 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2016-01-31 20:45:06 +01:00
Laurent Destailleur
7b15ac1179 Fix bad transaction level due to code of situation invoices 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2016-01-31 20:44:09 +01:00
Laurent Destailleur
0e1bb06d01 Fix duplicate set 2016-01-31 20:41:35 +01:00
Laurent Destailleur
6002adb04c Fix bad transaction level due to code of situation invoices 2016-01-31 20:38:11 +01:00
Florian HENRY
7d374c2b02 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/core/class/link.class.php
 2016-01-30 17:32:01 +01:00
Laurent Destailleur
eee0037a5b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-30 14:32:47 +01:00
Laurent Destailleur
c4d8c20abb Fix missing include 2016-01-30 14:32:20 +01:00
Florian HENRY
36901d5417 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-30 14:21:45 +01:00
Laurent Destailleur
3c63bf7ffa Merge pull request #4465 from defrance/patch-95 
if FAC_FORCE_DATE_VALIDATION can't change the billing date
 2016-01-30 12:43:52 +01:00
Laurent Destailleur
bb1cad871b Merge pull request #4478 from frederic34/patch-7 
Add fk_bordereau in account statements
 2016-01-30 12:34:09 +01:00
Laurent Destailleur
11f6cb6f5a Merge pull request #4479 from frederic34/patch-8 
Add fk_bordereau in account statement conciliation
 2016-01-30 12:31:36 +01:00
Florian HENRY
0582c78131 Add exepnse report into accoutnacy standard report 2016-01-29 14:05:37 +01:00
bobby
b95e9f0097 NEW : Add expense report into accountancy report 2016-01-28 14:26:52 +01:00
phf
4baff7898d FIX insert FactureLigne 
FIX phpunit PriceTest with new values returned for multicurrency module
NEW add test in PriceTest
FIX FactureTest properties not defined
 2016-01-26 22:18:31 +01:00
Maxime Kohlhaas
6313f64c93 Fix : amount in bank line is necessarily in the account currency 2016-01-26 18:09:52 +01:00
phf
83f90e2b1f Merge branch 'new_multicurrency_module' of github.com:atm-ph/dolibarr into new_multicurrency_module 
Conflicts:
	htdocs/commande/card.php
 2016-01-25 21:50:43 +01:00
phf
373225272b FIX reorder the display of currency and rate on propal/order 
FIX update line on propal/order
NEW add mulitcurrency on customer invoice
 2016-01-23 16:01:55 +01:00
Frédéric FRANCE
4ed2831112 Add fk_bordereau in account statement conciliation 2016-01-22 12:23:13 +01:00
Frédéric FRANCE
4d842d91d7 Add fk_bordereau in account statements 2016-01-22 12:20:03 +01:00
Laurent Destailleur
78ee675993 Merge pull request #4463 from frederic34/patch-9 
Update card.php
 2016-01-22 04:13:13 +01:00
Laurent Destailleur
d8cbe39c46 Merge pull request #4461 from frederic34/patch-8 
total records for payment list
 2016-01-22 04:13:02 +01:00
Laurent Destailleur
d7da972ead Merge pull request #4460 from frederic34/patch-7 
total records for deposit list
 2016-01-22 04:12:49 +01:00
Laurent Destailleur
93b2013aa7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/projet/tasks/list.php
 2016-01-22 03:29:55 +01:00
Laurent Destailleur
cceeefb7c2 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/societe/index.php
 2016-01-22 03:25:30 +01:00
Laurent Destailleur
600a4e961b Merge pull request #4464 from frederic34/patch-10 
typo
 2016-01-22 02:11:01 +01:00
Frédéric FRANCE
b0530539f4 Update rappro.php 2016-01-20 13:59:56 +01:00
Laurent Destailleur
03461d124a Fix activation of cron jobs by external module 
Clean code for task lists pages.
 2016-01-19 23:45:03 +01:00
BENKE Charlie
2036f17df5 if FAC_FORCE_DATE_VALIDATION can't change the billing date 2016-01-19 21:45:44 +01:00
Frédéric FRANCE
0a7de725b0 typo 2016-01-19 19:08:01 +01:00
Frédéric FRANCE
d242d6ec6d Update card.php 2016-01-19 17:39:21 +01:00
Frédéric FRANCE
b97417f3bf Update list.php 2016-01-19 12:18:29 +01:00
Frédéric FRANCE
6918a425a0 total records for deposit list 2016-01-19 12:15:37 +01:00
Laurent Destailleur
8e882b4cc2 NEW Add warning on tasks when they are late (add also the warning 
tolerance parameter)
 2016-01-18 15:56:51 +01:00
phf
a50a7366cb FIX travis test 2016-01-13 14:04:48 +01:00
phf
d213fbae08 FIX invoice situation 2016-01-13 13:42:58 +01:00
Laurent Destailleur
1b1bd73e6b Merge pull request #4404 from frederic34/patch-8 
FIX When doing payment for money back, bank account was not set by default
 2016-01-12 23:20:32 +01:00
Frédéric FRANCE
92885065c6 Update facture.php 2016-01-12 10:09:02 +01:00
aspangaro
cf6be40922 New: #3292 Make sure each and every page displays a title 2016-01-11 22:03:26 +01:00
Raphaël Doursenaud
7281338f8d FIX #4291 Correctly filter bank card GETPOSTs 2016-01-11 10:51:45 +01:00
Laurent Destailleur
68ef5ef5a8 Merge pull request #4388 from aspangaro/3.9-p5 
Fix: HRM index - typo and presentation
 2016-01-10 18:21:32 +01:00
aspangaro
47f63172e3 Fix: HRM index typo and presentation 2016-01-10 14:58:54 +01:00
Laurent Destailleur
c07cb5a72e Merge pull request #4371 from frederic34/patch-7 
Always show remove button and why we can't remove
 2016-01-10 11:37:56 +01:00
Laurent Destailleur
8653e7fa5c Merge remote-tracking branch 'origin/3.9' into develop 2016-01-10 00:12:51 +01:00
Juanjo Menent
dbd427ea06 Merge pull request #4264 from aspangaro/develop-a6 
Accountancy Add a list to select accounting account on bank account
 2016-01-09 17:42:52 +01:00
Frédéric FRANCE
0c6bd4e617 Update card.php 2016-01-09 10:37:53 +01:00
Laurent Destailleur
a0d11e157b Fix select2 component go over parent container so we introduce option to 
deal this.
 2016-01-08 23:17:45 +01:00
Laurent Destailleur
87c236b534 Fix when error creating invoice from predefined invoice, we must go back 
to create page from same predefined invoice.
 2016-01-08 16:30:43 +01:00
Laurent Destailleur
abe3f192fa Debug and fix when using dolibarr with jmobile 2016-01-03 16:23:23 +01:00
Laurent Destailleur
52cd5d505e Fix several bugs on css, translation or look 2016-01-01 23:44:23 +01:00
Laurent Destailleur
ed3f0ce86b Fix totalnboflines not correctly managed 2015-12-28 00:20:48 +01:00
Laurent Destailleur
6f474c403c Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/societe/notify/card.php
	htdocs/societe/price.php
 2015-12-27 19:15:20 +01:00
Laurent Destailleur
0645938283 FIX #4230 PHP7 error 2015-12-27 18:26:21 +01:00
Marcos García
da959c5cf0 Little typo in commit 8b633ae 2015-12-25 11:32:13 +01:00
Juanjo Menent
c6093fff3e Merge pull request #4289 from marcosgdf/bug-4285 
FIX #4285 SQL query shown when accessing an unexisting invoice
 2015-12-24 22:00:00 +01:00
Juanjo Menent
b9d0fc5aaf Merge pull request #4271 from grandoc/develop 
[Qual] Uniformize code
 2015-12-24 15:43:14 +01:00
Marcos García de La Fuente
de1625b9de FIX #4285 SQL query shown when accessing an unexisting invoice 2015-12-24 14:46:01 +01:00
Marcos García de La Fuente
8b633aee66 FIX #4182 SQL error when deleting an unexisting bank entry 2015-12-24 14:39:28 +01:00
Laurent Destailleur
8c1f271356 Maxi debug of module leave requests. 2015-12-24 12:37:38 +01:00
Laurent Destailleur
559e621fd2 Fix conflict with trigger to delete payment customer and supplier. 2015-12-23 19:54:56 +01:00
philippe grand
1eeee203d7 [Qual] comments should be in english 2015-12-22 09:37:27 +01:00
Laurent Destailleur
db7a98f0ef Fix: When a payment mode was disabled, it was not visible on old 
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
 2015-12-21 13:56:59 +01:00
Laurent Destailleur
fec5f4e20b Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2015-12-21 12:40:32 +01:00
Laurent Destailleur
0a515ca8c0 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2015-12-21 12:38:23 +01:00
Laurent Destailleur
932c3f9172 Fix init of situation_percent 2015-12-21 12:37:58 +01:00
Laurent Destailleur
a2ae9b9cfc Fix forget password page must have a different title then login page 
Fix Missing translations
 2015-12-21 00:47:44 +01:00
Laurent Destailleur
3517b64031 FIX #4228 PHP7 error 2015-12-19 18:18:24 +01:00
Laurent Destailleur
ba9796a438 Merge pull request #4082 from atm-maxime/fix_situation_percent 
Fix : situation percent should be 100 by default
 2015-12-19 17:49:04 +01:00
aspangaro
3b0514af6f Accountancy Add a list to select accounting account on bank account 2015-12-19 07:47:40 +01:00
Laurent Destailleur
98cd4f8307 Fix message so it is more clear what the feature can do or not. 
Fix list of email templates must be hidden for templates of disabled
modules.
 2015-12-18 12:48:20 +01:00
Laurent Destailleur
5eea1ce7d9 Fix several warnings 2015-12-17 19:37:24 +01:00
Laurent Destailleur
9973315a07 Fix we muste have ($limit = $conf->liste_limite; $offset = $limit * 
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
 2015-12-16 19:38:40 +01:00
Bahfir Abbes
e415a3ddf2 Update facture.php 
fix change customer function in customer invoices - include customers or prospects only
 2015-12-14 15:01:29 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-13 16:23:33 +01:00
Laurent Destailleur
a462cd232d Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 16:09:09 +01:00
philippe grand
30eb08151d [Qual] Close database handler should be after Footer 2015-12-11 14:19:38 +01:00
Laurent Destailleur
a209d18649 FIX Can use formated float number on old expense report module. 2015-12-06 19:51:28 +01:00
Laurent Destailleur
939a36428c Merge pull request #4156 from grandoc/develop 
[Qual] Uniformize code
 2015-12-06 14:42:58 +01:00
Laurent Destailleur
7f3531a04c Enhance script to track duplicate translation string and use it to 
remove around 50 duplicates.
 2015-12-06 13:34:57 +01:00
Laurent Destailleur
374480043e Add maxwidth300 on combo list for users and sale representatives 2015-12-06 00:37:58 +01:00
philippe grand
94fe00fe8d [Qual] Uniformize code 2015-12-04 19:45:39 +01:00
Laurent Destailleur
a7d03af4af Fix sending emails from mergepedtool was just doing wrong things. 2015-12-03 12:47:21 +01:00
Laurent Destailleur
055e650adf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-02 23:23:38 +01:00
Laurent Destailleur
574b270da0 Work on the "mass action" feature. Can run mass action on 
result of a select.
 2015-12-02 22:00:39 +01:00
Laurent Destailleur
c55d11869b Billing of supplier or customer order is a process that can be done in 
parallel with shipment or reception, so we show the status on another
field into lists.
 2015-11-29 15:54:32 +01:00
Laurent Destailleur
88e76dcf64 Fix utf8 encoded twice 2015-11-28 14:40:23 +01:00
Maxime Kohlhaas
da51a28766 Fix : situation percent should be 100 by default 2015-11-23 17:22:29 +01:00
Frédéric FRANCE
3d05b53a62 Typo 2015-11-22 19:08:38 +01:00
Laurent Destailleur
5e0b5cb75d Merge pull request #4009 from frederic34/patch-7 
Update list.php
 2015-11-21 00:18:29 +01:00
Laurent Destailleur
401b2a7389 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/theme/md/style.css.php
 2015-11-20 23:47:07 +01:00
Frédéric FRANCE
c647ad6425 Update list.php 2015-11-18 18:15:02 +01:00
philippe grand
42ed3d2bb7 [Qual] Uniformize code 2015-11-18 16:05:41 +01:00
Laurent Destailleur
fbd1d2360f Comment 2015-11-18 13:42:38 +01:00
Frédéric FRANCE
0424a2bb3d Update list.php 2015-11-16 16:27:37 +01:00
philippe grand
f190e5f931 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-11-16 08:48:07 +01:00
Laurent Destailleur
388748055a Fix missing translation for VAT 2015-11-15 15:08:54 +01:00
philippe grand
f308606ee1 [Qual] Uniformize code 2015-11-15 07:47:35 +01:00
Laurent Destailleur
192fdbdcc4 Minor look uniformization 2015-11-14 23:10:12 +01:00
Laurent Destailleur
01058be44c NEW Introduce a "code" into fiels to describe vat. This will allow to 
suggest different vat lines with same value with ability to
differentiate them.
 2015-11-14 17:53:58 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
 2015-11-13 12:35:10 +01:00
Laurent Destailleur
93be4305c4 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/card.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/fichinter/card.php
	htdocs/societe/rib.php
 2015-11-13 12:18:46 +01:00
Laurent Destailleur
eac80d7db4 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
 2015-11-13 11:43:29 +01:00
Laurent Destailleur
ea6fe02f18 Merge pull request #3923 from altatof/customerinfos 
NEW FEATURE PROPOSAL: on propale, order or invoice creation from
 2015-11-13 00:35:39 +01:00
Laurent Destailleur
74a4006a84 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-12 21:25:30 +01:00
Laurent Destailleur
b2285ca5e0 Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default. 
All emails sent from Dolibarr have a dedicated tracking id.
 2015-11-12 21:25:01 +01:00
Florian HENRY
019575d9ed FIX : better fix for #3805 2015-11-12 13:21:35 +01:00
philippe grand
c712532bf6 [Qual] Uniformize code 2015-11-12 11:59:15 +01:00
Christophe Battarel
cc35f2b738 Merge branch 'develop' into customerinfos 2015-11-11 15:46:22 +01:00
Christophe Battarel
0c40a6dda5 add hidden constant 2015-11-11 15:32:42 +01:00
philippe grand
12c5d02a7a [Qual] Uniformize code 2015-11-11 12:27:09 +01:00
Juanjo Menent
a6f0baefc1 Merge pull request #3933 from marcosgdf/bug-3980 
FIX #3890 Expected transactions bank account page, shows negative numbers
 2015-11-08 11:15:31 +01:00
Laurent Destailleur
1d2dab63a3 More space 2015-11-08 02:32:22 +01:00
Laurent Destailleur
333dd10874 Add a way to lin on bank receipt tab directly 2015-11-08 02:09:32 +01:00
Laurent Destailleur
7a423c04d4 Fix The only default value is value we just entered 2015-11-08 02:00:28 +01:00
Laurent Destailleur
e350b759d3 Increase number of last bank receits visible links 2015-11-08 00:52:25 +01:00
Laurent Destailleur
b5c9602da4 Fix Use new look for left-right arrow 2015-11-08 00:08:50 +01:00
Laurent Destailleur
031b33d582 FIX Checkbox reconciliated no correctly checked with some Chrome 
versions
 2015-11-07 23:54:11 +01:00
Laurent Destailleur
3906cb79c5 NEW: Add parameter to add a link to use "date of invoice" in one click 
when fille a payment card.
 2015-11-07 23:46:07 +01:00
Marcos García de La Fuente
01854b3259 FIX #3679 Error when deleting a Localtax2 special payment 2015-11-07 13:51:09 +01:00
Marcos García de La Fuente
728f469c1e FIX #3890 Expected transactions bank account page, shows negative numbers 2015-11-07 13:43:59 +01:00
Marcos García de La Fuente
b4c3804c91 FIX #3928 Creating a Customer order and a Customer invoice from a project, does not inherit payment conditions and method of payment of customer card 2015-11-07 13:21:03 +01:00
Christophe Battarel
f52ae35dc6 NEW FEATURE PROPOSAL: on propale, order or invoice creation from 
scratch, reload page after customer selection so its informations can be
loaded
 2015-11-06 16:14:00 +01:00
Florian HENRY
121d2beb80 fix spacing 2015-11-06 10:34:18 +01:00
Florian HENRY
f220f584ce Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-06 10:31:03 +01:00
Florian HENRY
126b5d6eca FIX : only active customer should be available into select list 
thirdparty on invoice creation
 2015-11-06 10:19:10 +01:00
Florian HENRY
600dbced7e Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-11-06 09:49:48 +01:00
Florian HENRY
8d829dca32 FIX : only active customer should be return into new invoice creation 
select list
 2015-11-06 09:49:02 +01:00
Sergio Sanchis Climent
6b01db5960 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2015-11-06 02:08:55 +01:00
Sergio Sanchis Climent
de8e7107ee Maintain origin_id and origin for copy document 
Fix any errors.
 2015-11-06 01:53:20 +01:00
Laurent Destailleur
04664c203d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/product/stock/product.php
 2015-11-05 22:13:08 +01:00
Laurent Destailleur
58cac2d895 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/product/stock/product.php
 2015-11-05 22:09:54 +01:00
Laurent Destailleur
fe78996026 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/product/stock/fiche.php
	htdocs/product/stock/valo.php
 2015-11-05 22:04:18 +01:00
Christophe Battarel
80d2445540 FIX: bad stock valorisation 2015-11-05 17:00:22 +01:00
fmarcet
015dedc3ab FIX: Show category selector if we have permission to view products or 
services
 2015-11-05 11:53:45 +01:00
Laurent Destailleur
1f4481a6b0 Merge pull request #3172 from atm-maxime/new_creditnote 
NEW Add hidden option INVOICE_CREDIT_NOTE_STANDALONE to allow to create credit note without invoice
 2015-11-05 02:45:15 +01:00
Raphaël Doursenaud
c534f5bcd5 Fix #3805 Enhanced Facture::is_last_in_cycle() 2015-11-04 20:35:20 +01:00
Laurent Destailleur
a7795f25fc Fix Must make a difference between a buying/cost price == '' (not 
provided) and buying/cost price = '0'. We must use default value only if
value is '' and not if forced to '0'.
 2015-11-04 17:51:15 +01:00
Laurent Destailleur
563a020595 NEW Free text for cheque deposit receipt can be HTML content. 2015-11-02 20:35:33 +01:00
Laurent Destailleur
da0aa2f937 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/langs/en_US/main.lang
	htdocs/product/list.php
	htdocs/product/stock/mouvement.php
 2015-11-02 19:31:42 +01:00
Laurent Destailleur
3ba97627ff FIX Default thirdparty when cloning invoice was not set. 2015-11-02 15:50:03 +01:00
Laurent Destailleur
200e4638f4 Merge pull request #3812 from fappels/develop-best-pmp-pos-margin 
Fix: #2591 Margin is incorrect used with POS
 2015-11-02 11:06:20 +01:00
aspangaro
d8f77f58d7 Salaries : Replace "label for" by the function fieldLabel & add some notes 2015-11-02 06:42:17 +01:00
fappels
4d839eea60 Fix #2591 Margin is incorrect used with POS 
if buy price not defined, define buyprice as configured in margin admin.
If 'Force buying price if null' is off, marge will be equal to suggested
default.(min supplier price or pmp)
Updated all classes reading 'Force buying price if null' setting.
 2015-10-26 20:33:42 +01:00
Maxime Kohlhaas
bd831b1f24 Merge branch 'new_creditnote' of github.com:atm-maxime/dolibarr into new_creditnote 2015-10-26 09:40:50 +01:00
Laurent Destailleur
080ba15e0d FIX The price per level just never correctly manage the vat. Vat is not 
per level but depends on seller and supplyer. I kept a hidden option to
keep old behaviour that was bugged.
 2015-10-25 22:50:05 +01:00
Laurent Destailleur
1f1e72f2b6 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/main.inc.php
 2015-10-25 19:54:41 +01:00
Laurent Destailleur
461771d488 Currency is on title only. 2015-10-24 21:20:32 +02:00
Laurent Destailleur
cac4a85ccd Merge pull request #3788 from atm-maxime/new_customer_recap 
New customer recap
 2015-10-22 18:02:38 +02:00
Maxime Kohlhaas
ef2337a338 Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8 
Conflicts:
	htdocs/compta/facture/list.php
 2015-10-22 14:41:58 +02:00
Frédéric FRANCE
5237a2afc7 Fix lost searchstatus on next page list 2015-10-20 17:45:24 +02:00
Laurent Destailleur
22979523db Try a fix for #3742 2015-10-20 02:34:53 +02:00
Maxime Kohlhaas
4de7874118 New : review customer account summary and balance 2015-10-19 20:36:25 +02:00
Maxime Kohlhaas
d79fb71987 FIX : search_status not used in mergefusiontool 2015-10-19 16:17:47 +02:00
Maxime Kohlhaas
5fb6705b5c FIX : Search status not saved into list 2015-10-19 15:53:13 +02:00
Maxime Kohlhaas
9e9f32e3bf FIX : project was not retrieved on invoice creation form 2015-10-19 15:38:28 +02:00
Laurent Destailleur
81580f75b9 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture.php
 2015-10-18 21:22:42 +02:00
Laurent Destailleur
bf6b48f5a0 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-10-18 21:17:29 +02:00
Laurent Destailleur
afe4057a97 FIX #3757 Can't set amount in a social contribution with some languages 2015-10-18 21:17:19 +02:00
Laurent Destailleur
be8e7515a1 Merge pull request #3762 from simnandez/3.8 
Fix: Last page total is 0
 2015-10-18 20:27:17 +02:00
Laurent Destailleur
420bfd8301 FIX Preview pages was not using correct style for ref 2015-10-18 19:09:35 +02:00
Laurent Destailleur
c51bc09e39 FIX The preview of PDF was never refreshed if PDF document was changed 2015-10-18 18:54:54 +02:00
Juanjo Menent
334c14d088 Fix: Last page total is 0 2015-10-18 11:56:42 +02:00
philippe grand
f31ddc23aa [Qual] Uniformize code 2015-10-17 16:18:33 +02:00
Laurent Destailleur
3ce147ccc1 Use new architecture for quick search for the account area. 2015-10-17 02:41:09 +02:00
Laurent Destailleur
8c66a7d099 Revert a bad PR. if form_confirm is replaced with formconfirm, we must 
include a print before. It is no more included into function.
 2015-10-17 02:01:13 +02:00
Laurent Destailleur
7fd6d8839a Uniformize code and use a new generic search architecture 2015-10-17 01:40:46 +02:00
Laurent Destailleur
d1d6c72d7d NEW Uniformize way of working for search filters. One filter per object. 2015-10-16 22:21:26 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Gauthier
b3e3cc14a7 FIX : 1/ update_extra() function musn't be in "if(!empty(MAIN_DISABLE_CONTACTS_TAB)" test. 
2/ Reindented code
 2015-10-15 17:26:16 +02:00
Laurent Destailleur
918d9b7c18 Fix filter was lost if nothing found 2015-10-13 12:05:24 +02:00
Laurent Destailleur
7b7d27920d Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/adherents/type.php
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/product/composition/card.php
 2015-10-10 18:56:28 +02:00
Frédéric FRANCE
7065b2aa7d Update account.php 2015-10-10 12:59:58 +02:00
Laurent Destailleur
eeac01b794 Merge pull request #3683 from aspangaro/develop-68 
New : Add payment donation in accountancy expert & presentation
 2015-10-09 20:25:50 +02:00
Laurent Destailleur
a1d37f92cb Several fix in CSS 2015-10-09 20:00:43 +02:00
Laurent Destailleur
61d739635e Uniformize code and css for tables. Filters must be implemented 
following example in test_arrays.php.
 2015-10-09 12:30:16 +02:00
philippe grand
0e343ae3b2 syntax error 2015-10-08 09:34:02 +02:00
aspangaro
e0f2c41a37 Merge remote-tracking branch 'Upstream/develop' into develop-68 2015-10-07 21:08:00 +02:00