Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
54,329 Commits 36 Branches 189 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

2164 Commits

Author SHA1 Message Date
Laurent Destailleur
08c5fd2e36 FIX #4809 - Duplicate functions with different content 2016-03-14 14:38:30 +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
philippe grand
adc552d5ff Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9 2016-03-12 20:52:09 +01:00
philippe grand
df1c5697be [fix]: define to avoid issue with external pdf models 2016-03-12 19:07:56 +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
Regis Houssin
7953f77b07 Fix: $fileparams is not defined 2016-03-11 18:08:27 +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
ba5b0efb53 The warning for late orders is visible on order card 2016-03-10 10:53:01 +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
Laurent Destailleur
71246c864a FIX Bad td balance and default checkbox value 2016-03-08 17:31:46 +01:00
Laurent Destailleur
d1777a6783 Replace function rand with mt_rand (prepare php 8) 2016-03-05 15:01:25 +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
Ion Agorria
a1159b6f29 Fix: unset date start/end at success 2016-03-04 14:11:06 +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
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
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
fmarcet
30d6aa0b96 FIX: Some filters are lost when paging 2016-02-26 13:14:23 +01:00
Laurent Destailleur
8927948bef NEW Add option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN 2016-02-25 16:27:28 +01:00
Laurent Destailleur
59a6cb5f55 Fix bad support of option WORKFLOW_BILL_ON_SHIPMENT 
Conflicts:
	htdocs/commande/list.php
 2016-02-25 03:06:37 +01:00
Laurent Destailleur
96305ca00f Fix bad support of option WORKFLOW_BILL_ON_SHIPMENT 2016-02-25 03:04:36 +01:00
Laurent Destailleur
9900620695 uniformize labels 2016-02-25 02:05:28 +01:00
Laurent Destailleur
4b89b0b7aa Fix bad status translation for shipment 2016-02-24 22:13:29 +01:00
Laurent Destailleur
6ee4637f35 Fix bad status translation for shipment 2016-02-24 22:12:38 +01:00
Laurent Destailleur
d3960b0809 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/member.lib.php
	htdocs/expedition/card.php
 2016-02-20 04:25:39 +01:00
Laurent Destailleur
2e27319d1b Fix Removed not expected br 2016-02-20 03:42:29 +01:00
Laurent Destailleur
761ad0114c Merge pull request #4641 from atm-ph/new_add_multicurrency_supplier_proposal_order 
New add multicurrency on supplier proposal/order
 2016-02-19 03:36:23 +01:00
phf
e24a35b904 New add multicurrency on supplier proposal/order 2016-02-16 23:58:21 +01:00
phf
6d095fce9f Fix replace dol_include_once() function by require_once for internal module 2016-02-16 20:44:23 +01:00
abb
3e6eca546a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev 
Conflicts:
	htdocs/fichinter/card.php
	htdocs/langs/en_US/products.lang
 2016-02-15 00:06:51 +01:00
Laurent Destailleur
6662c1b5e1 NEW Can select dynamicaly number of lines to show on page on product, 
shipment, contact, orders, thirdparties
Fix can make a shipment for product not predefined in multiwarehouse
mode
 2016-02-10 23:37:34 +01:00
Laurent Destailleur
5ea9c6dd83 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.formprojet.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/accountancy.lang
 2016-02-09 14:40:25 +01:00
Laurent Destailleur
223195538a Return bad late or not status for order 2016-02-09 14:29:12 +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
9da0164d90 Uniformize code for lists 2016-02-07 15:50: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
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
e3a4124a58 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/fr_FR/bills.lang
 2016-01-30 16:13:06 +01:00
Laurent Destailleur
5e9fd25a6e Merge remote-tracking branch 'origin/3.8' into 3.9 2016-01-30 15:59:40 +01:00
Regis Houssin
8a80e06580 Fix: missing field "label" 2016-01-28 11:42:00 +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
Frédéric FRANCE
9909918078 Text not initialized 2016-01-25 13:52:35 +01:00
Laurent Destailleur
274caf61eb NEW Add statistics for interventions module 2016-01-25 13:34:05 +01:00
Laurent Destailleur
467dc12a7b NEW Module "Supplier commercial proposal" (price request) is set to 
stable status.
 2016-01-25 12:33:38 +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
phf
e86ebd6799 NEW add multicurency on customer order 2016-01-23 00:38:17 +01:00
Laurent Destailleur
ddd8f8586f Fix rewrite of project and task list to solve bad listing 
Fix correct sort and pagination of lists
 2016-01-21 14:59:09 +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
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