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

6162 Commits

Author SHA1 Message Date
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