lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
54,042 Commits 43 Branches 150 Tags 886 MiB
9508de85af
Commit Graph

6189 Commits

Author SHA1 Message Date
Laurent Destailleur
11217db8c4 FIX: when creating project from template/recurring invoice creation, we 
lost information we were working in template/recurring invoice.
 2016-04-27 10:56:40 +02:00
Laurent Destailleur
78cda5dc07 Fix problem with code of reccuring invoices 2016-04-26 22:00:41 +02:00
Laurent Destailleur
c73f4e5d7b FIX Project was lost when creating invoice from a template 
Can set project on invoice during creation of invoice from a template
Replace duplicated code to show lines with mutualized code
 2016-04-24 20:00:00 +02:00
Laurent Destailleur
ccdbf69cd5 Bette explanation on how to create an repeatable invoice 2016-04-24 18:11:19 +02:00
Marcos García de La Fuente
82ee964c27 NEW #4972 Translated Charges sociales (type 0) and Charges sociales (type 1) in reports page 
Close #4972
 2016-04-23 18:22:11 +02:00
Maxime Kohlhaas
c5787a4bba New add remain to pay column in invoice list (was present in previous versions) 2016-04-23 16:02:18 +02:00
Marcos García de La Fuente
f195107bd1 Fixed undefined $user variable in Account::countAccountToReconcile 2016-04-23 13:25:23 +02:00
aspangaro
2a7c7a0748 Same problem on bank 2016-04-23 08:09:38 +02:00
Laurent Destailleur
5bfc65676c Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	ChangeLog
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php
	htdocs/theme/eldy/style.css.php
 2016-04-22 21:02:20 +02:00
Laurent Destailleur
63d04f4f2d Merge pull request #5066 from atm-maxime/fix_thirdparty_instead_client 
Fix order creation bug because of ->client
 2016-04-22 19:20:48 +02:00
Laurent Destailleur
da14f247bb Merge pull request #5070 from atm-maxime/fix_display_payment_on_invoices 
Fix payment display on customer invoice and replicate on supplier inv…
 2016-04-22 19:19:46 +02:00
Laurent Destailleur
ec407af81a Merge pull request #5072 from atm-maxime/fix_bank_releve_display 
Fix bank statement display
 2016-04-22 19:12:56 +02:00
Laurent Destailleur
25b7f0ab62 FIX Remove a total that has no sense 2016-04-22 17:11:12 +02:00
Maxime Kohlhaas
5904f33039 Fix bank statement display 2016-04-22 11:44:23 +02:00
Maxime Kohlhaas
fc7056650e Fix payment display on customer invoice and replicate on supplier invoice 2016-04-22 10:42:06 +02:00
Maxime Kohlhaas
e881701968 Fix pdf generation with thirdparty 2016-04-22 09:46:47 +02:00
Laurent Destailleur
dd443fe7f5 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/compta/localtax/quadri_detail.php
 2016-04-21 02:42:43 +02:00
Laurent Destailleur
1e5ff7388c Merge pull request #5031 from marcosgdf/refactor-deprecated-co-client 
NEW Removed deprecated CommonObject::client property
 2016-04-21 01:49:12 +02:00
Laurent Destailleur
0c932e0ee6 Merge pull request #4997 from atm-maxime/fix_vat_on_credit_note 
Fix VAT amount on credit note was > 0 when manually entered
 2016-04-19 19:21:05 +02:00
Laurent Destailleur
005751f330 Merge pull request #4963 from altatof/add_filter_type_on_turnover_report 
NEW: add product type filter on turnover report
 2016-04-19 19:15:04 +02:00
Laurent Destailleur
d40e659b30 Merge pull request #4858 from marcosgdf/oop-refactor-bankaccount-tostring 
NEW Created Account::__toString, Account::getFieldsToShow and Account::getAccountNumberOrder to refactor the way account number was shown
 2016-04-19 19:11:54 +02:00
Frédéric FRANCE
18b3b3a31d Update rappro.php 2016-04-18 08:14:02 +02:00
Marcos García de La Fuente
e2c86d3fd8 NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead 2016-04-17 15:24:22 +02:00
Juanjo Menent
ecbf5996c1 FIX #4961 2016-04-15 17:20:37 +02:00
Juanjo Menent
9f4ccfab95 FIX #3815 With higher quality 2016-04-15 15:54:51 +02:00
Juanjo Menent
c5ecc46a22 FIX #3815 With higher quality 2016-04-15 15:42:58 +02:00
Juanjo Menent
4446e6a36c FIX #3815 Call to undefined function local_by_date(). branch 3.8 2016-04-15 12:47:21 +02:00
Juanjo Menent
2d3b2c08b5 FIX #3815 Call to undefined function local_by_date(). branch 3.7 2016-04-15 10:56:03 +02:00
Maxime Kohlhaas
9de6d31c87 New add link to widthdraw slip card on bank transaction 2016-04-13 15:57:46 +02:00
Laurent Destailleur
8d46d76f96 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:05:18 +02:00
Laurent Destailleur
e61c83d708 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:03:19 +02:00
Laurent Destailleur
357877b1fe Debug multicurrency and clean properties of some modules 2016-04-12 14:45:59 +02:00
Maxime Kohlhaas
25dcca301f Fix VAT amount on credit note was > 0 when manually entered 2016-04-12 09:47:35 +02:00
Christophe Battarel
0dd25a7e70 add new filter in GROUP BY clause 2016-04-12 09:39:48 +02:00
Laurent Destailleur
46dd3c0cec Merge pull request #4982 from marcosgdf/bug-4737 
FIX #4737 Bank transacion type selector translation is cropped
 2016-04-11 18:58:26 +02:00
Juanjo Menent
4f5d96150a Merge pull request #4977 from marcosgdf/bug-4766 
FIX #4766 VAT not shown in supplier invoice popup
 2016-04-10 11:42:29 +02:00
Marcos García de La Fuente
a41a80b8fe Merge branch 'develop' into oop-refactor-bankaccount-tostring 2016-04-09 23:17:09 +02:00
Marcos García de La Fuente
3135cf720d FIX #4737 Bank transacion type selector translation is cropped 
Close #4737
 2016-04-09 22:59:12 +02:00
Marcos García de La Fuente
9169adf4ce FIX #4766 VAT not shown in supplier invoice popup 
Close #4766
 2016-04-09 22:34:55 +02:00
Laurent Destailleur
dd1f946afe Clean dead code 2016-04-09 19:06:40 +02:00
Laurent Destailleur
724610ba5b Quality fixes reported by scrutinizer 2016-04-09 15:07:55 +02:00
Laurent Destailleur
5b55af4d66 NEW Mutualize code: Use one call of function "addThumbs", when possible, 
to generate thumbs files instead of several call of "vignette" function.
 2016-04-09 14:12:21 +02:00
Laurent Destailleur
01e538fa78 Merge pull request #4942 from aspangaro/4.0-p16 
NEW: Move HRM area page in HRM directory
 2016-04-08 20:51:17 +02:00
Laurent Destailleur
104e34fe22 Fix css and missing link "go to list" 2016-04-08 03:40:23 +02:00
Laurent Destailleur
7a48ceb635 Uniformize code for mass actions 2016-04-08 02:53:10 +02:00
Laurent Destailleur
8222624ff0 NEW Can select fields to show on list also for list of customer orders, 
shipments and invoices.
 2016-04-08 02:39:57 +02:00
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