Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 12:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,834 Commits 36 Branches 190 Tags
c16cb15ce30ba644f33f01e32b273677007c8044
Commit Graph

1126 Commits

Author SHA1 Message Date
Laurent Destailleur
f6d1913bb7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2016-02-22 13:35:46 +01:00
Laurent Destailleur
7ba6754a55 Fix the missing button to record reception 2016-02-18 00:27:35 +01:00
phf
e24a35b904 New add multicurrency on supplier proposal/order 2016-02-16 23:58:21 +01:00
Laurent Destailleur
158906455a NEW Can change dynamically number of records visible into lists. 2016-02-11 20:40:33 +01:00
Laurent Destailleur
9da0164d90 Uniformize code for lists 2016-02-07 15:50:48 +01:00
Laurent Destailleur
99b2236260 FIX Selection of project must no show closed project 2016-01-28 12:19:13 +01:00
Laurent Destailleur
df4cd3de17 FIX Selection of project must no show closed project 2016-01-28 12:05:14 +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
Laurent Destailleur
4df584e57b Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-01-23 11:51:56 +01:00
Laurent Destailleur
dbaa43f3be Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/holiday/card.php
	htdocs/holiday/list.php
	htdocs/user/card.php
 2016-01-23 11:45:39 +01:00
Laurent Destailleur
dc438792f4 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/fourn/commande/card.php
 2016-01-23 11:39:37 +01:00
Regis Houssin
905f9d78ed Fix: $outputlangs is not defined (dolibarr 3.7, 3.8, 3.9) 2016-01-15 13:12:19 +01:00
fappels
51b08f579b Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse 
Fix Conflicts:
 2016-01-12 13:56:00 +01:00
Laurent Destailleur
f25a9030eb Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	.travis.yml
	htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
	htdocs/core/modules/commande/doc/pdf_proforma.modules.php
	htdocs/includes/adodbtime/adodb-time.inc.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-18 22:12:03 +01:00
fappels
7fc8007571 New add shipping and dispatching from/to multiple warehouses 
Add select2 to warehouse selectors
Ship customer orderline from multiple warehouses
Dispatch client orderline to multiple warehouses
 2015-12-18 18:00:31 +01:00
Laurent Destailleur
84ee18a11b Fix bad management of second level approvement 2015-12-14 10:33:18 +01:00
Laurent Destailleur
3bcdc5c9c0 Merge pull request #4181 from grandoc/develop 
[Qual] Uniformize code
 2015-12-10 13:35:44 +01:00
philippe grand
01c6728aa9 [Qual] Uniformize code 2015-12-08 11:35:08 +01:00
Ion Agorria
1dc5854535 Fix date handling for hours/mins in some pages 2015-12-07 03:59:03 +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
5df193ec93 Uniformize code 2015-11-28 20:25:50 +01:00
Laurent Destailleur
88e76dcf64 Fix utf8 encoded twice 2015-11-28 14:40:23 +01:00
Alexis Algoud
55b23c4918 FIX add billed field in supplier order 2015-11-16 14:55:46 +01:00
Laurent Destailleur
6bd6be0912 Debug and rename experimental module "supplier proposal". Still work to 
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
 2015-11-15 19:23:39 +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
frederic34
a597d6c379 allow chaining 2015-11-07 10:23:56 +01:00
frederic34
becce332dd allow chaining and remove header exit 2015-11-07 09:52:00 +01:00
Laurent Destailleur
e26940ddf7 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/filelist.xml
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
	htdocs/societe/price.php
 2015-11-05 01:50:30 +01:00
Laurent Destailleur
df4f09e72f FIX #3240 2015-11-03 14:02:36 +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
d8796e4cc7 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/product/stats/commande.php
	htdocs/product/stats/commande_fournisseur.php
	htdocs/product/stats/facture.php
	htdocs/product/stats/facture_fournisseur.php
	htdocs/product/stats/propal.php
 2015-11-02 19:25:51 +01:00
Laurent Destailleur
a9ddcc1a80 Merge pull request #3832 from frederic34/patch-16 
NEW Add supplier order to the Direct Printing System
 2015-11-02 11:27:00 +01:00
Laurent Destailleur
2c682022cf NEW The search box and the bookmarks are now rendered by the menu 
manager.
 2015-10-30 09:36:57 +01:00
Laurent Destailleur
6cc3df7e71 NEW Quick searh filter works on invoice, proposal, order, intervention, 
contract
 2015-10-30 08:35:56 +01:00
Frédéric FRANCE
ff9648eed9 Update card.php 2015-10-29 19:09:37 +01:00
atm-robin
29b8919a40 FIX supplier rights for orderToInvoice 2015-10-26 14:34:46 +01:00
philippe grand
1762b3aaa7 [Qual] Uniformize code 2015-10-17 17:09:34 +02:00
Laurent Destailleur
2122d4d43a NEW Contract module can be used to follow both sold and bought 
contracts/recurring subscriptions.
 2015-10-17 00:52:35 +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
Laurent Destailleur
80bd563fde Use GETPOST 2015-10-11 20:41:06 +02:00
Laurent Destailleur
1f742c7464 FIX Add a test to save life when ref of object (invoice ref, order ref, 
...) was empty. The was no way to go back to a clean situation, even
after vaidating again the object.
 2015-10-06 16:38:27 +02:00
frederic34
9a021e6de4 Optioncss not kept in list 2015-10-04 10:45:57 +02:00
Juanjo Menent
31230d296d Merge remote-tracking branch 'upstream/3.8' into develop 2015-10-03 23:51:38 +02:00
philippe grand
e22fb3c538 fix : Typo 2015-10-02 12:39:09 +02:00
philippe grand
8a9c9f49d5 fix : Typo 2015-10-02 12:37:13 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529 [Qual] Replaced deprecated print_titre() 2015-09-24 18:27:13 +02:00
Laurent Destailleur
da6a1d6629 NEW Introduce a method getDefaultCreateValueForField for developers to 
get a default value to use for a form in create mode.
Implement it for public and private notes.
 2015-09-22 13:55:31 +02:00
Laurent Destailleur
db1d9d6d8e Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/fourn/commande/dispatch.php
 2015-09-12 11:50:46 +02:00
Laurent Destailleur
a83b3ae7e8 Merge pull request #3503 from fappels/3.7-dispatch-rounding 
Fix #3471 3.7 Rounding issue when dispatching non-integer
 2015-09-12 11:07:16 +02:00