Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
52,275 Commits 36 Branches 189 Tags
e6d06a67b48e2dbedb25eddde1cbf8ea2ac6657f
Commit Graph

1076 Commits

Author SHA1 Message Date
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
3bcc7b0f8f Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/comm/remise.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/price.php
 2016-02-15 01:37:23 +01:00
Laurent Destailleur
c85b7932a9 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2016-02-15 01:18:59 +01:00
Laurent Destailleur
04b390f21c Merge pull request #4507 from altatof/PROPAL_CLONE_ON_CREATE_PAGE 
FIX ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden constant
 2016-02-14 21:59:04 +01:00
Laurent Destailleur
13c85516ee Doc comment 2016-02-14 21:58:54 +01:00
Christophe Battarel
1baf25de3c FIX ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden 
constant
 2016-01-27 12:04: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
phf
8e933ebb2d Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module 2016-01-25 19:31:35 +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
21db62d645 FIX multicurrency price always display and update line price if rate is 
update
 2016-01-22 22:35:32 +01:00
phf
f7afbcff68 NEW integration of multicurrency module (creation fields in database and admin) 
NEW add multicurrency_code on create, update and fetch company object
NEW add multicurrency on propal
FIX travis
FIX back quote into sql file
 2016-01-21 21:38:52 +01:00
Ion Agorria
1dc5854535 Fix date handling for hours/mins in some pages 2015-12-07 03:59:03 +01:00
Laurent Destailleur
e002021d7d Fix td balance 2015-12-05 17:49:08 +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
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
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
b34edeb751 [Qual] Uniformize code 2015-11-07 21:56:21 +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
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
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
7d382f7997 FIX Revert option WORKFLOW_PROPAL_CAN_CLASSIFIED_BILLED_WITHOUT_INVOICES 
into option WORKFLOW_PROPAL_NEED_INVOICE_TO_BE_CLASSIFIED_BILLED
for better compatibility with old versions
 2015-10-19 18:17:19 +02:00
philippe grand
f31ddc23aa [Qual] Uniformize code 2015-10-17 16:18:33 +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
8a02c8288b Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/product/index.php
 2015-10-16 09:56:55 +02:00
Laurent Destailleur
9b85a70013 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
 2015-10-16 09:52:38 +02:00
Juanjo Menent
31230d296d Merge remote-tracking branch 'upstream/3.8' into develop 2015-10-03 23:51:38 +02:00
Laurent Destailleur
00911d1afe Fix bad param 2015-10-03 19:05:13 +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
Laurent Destailleur
3f506552e3 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/theme/md_exp/style.css.php
 2015-09-27 21:29:16 +02:00
Juanjo Menent
d503dd928b Merge pull request #3597 from GPCsolutions/displaymargin 
[Qual] Replaced deprecated displayMarginInfos()
 2015-09-26 08:47:55 +02:00
Raphaël Doursenaud
50edf63448 [Qual] Replaced deprecated displayMarginInfos() 2015-09-24 21:05:58 +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
a70e73a963 FIX Missing validate button if permission are not valid. 2015-09-23 01:08:23 +02:00
Laurent Destailleur
f81df66564 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/.gitignore
	htdocs/categories/edit.php
 2015-09-23 00:34:57 +02:00
Laurent Destailleur
00b858e644 Merge pull request #3564 from FHenry/3.8 
FIX : remove twice same test
 2015-09-23 00:07:28 +02:00
Laurent Destailleur
077c696c09 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/.gitignore
	htdocs/theme/.gitignore
 2015-09-22 16:28:34 +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
Florian HENRY
178208918f FIX : remove twice same test 2015-09-22 12:03:11 +02:00
Marcos García de La Fuente
e80f29c271 Fix: [ bug 1794 ] - Error when cloning Proposal gives error in a malformed page 2015-09-16 12:47:13 +02:00
Florian HENRY
a0fb27bd80 FIX : Can create Proposal on close thridparty #3526 2015-09-15 14:34:49 +02:00
Laurent Destailleur
0d811dce6a Start to mutualize the builddoc and remove_file action. 2015-09-06 14:21:42 +02:00
Laurent Destailleur
5fd6c44640 Fix error management 2015-08-31 13:00:24 +02:00
Laurent Destailleur
5ca6593a57 Fix serious deadlock feature. It was possible to link with no way to 
unlink. What if user make a bad click ? I complete feature with
reverse action to be sure to not have users with a corrupted situation.
 2015-07-28 14:13:16 +02:00
Laurent Destailleur
5fafb08f91 Uniformize code 2015-07-04 04:11:16 +02:00
Laurent Destailleur
9c80735310 An easier to use dictionary page to edit email template. 
Uniformize look.
 2015-07-04 03:28:52 +02:00
Regis Houssin
e3d1614004 Fix: ereg more simple 2015-06-11 09:21:44 +02:00