Laurent Destailleur
a12e959833
Do not show billed status after order status
2015-11-29 16:33:50 +01:00
frederic34
e0ee6718ad
Select warehouse on order card
2015-11-15 11:42:47 +01:00
Laurent Destailleur
ab177b43af
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/.gitignore
htdocs/comm/mailing/card.php
htdocs/commande/list.php
htdocs/compta/facture.php
htdocs/expedition/class/expedition.class.php
2015-11-13 12:35:10 +01:00
Laurent Destailleur
93be4305c4
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/accountancy/customer/card.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/card.php
htdocs/accountancy/supplier/list.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/fichinter/card.php
htdocs/societe/rib.php
2015-11-13 12:18:46 +01:00
Laurent Destailleur
bad28c6d92
Fi sntax error
2015-11-13 11:44:55 +01:00
Laurent Destailleur
eac80d7db4
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
2015-11-13 11:43:29 +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
frederic34
cd738ef483
Merge remote branch 'upstream/develop' into fccard
...
Conflicts:
htdocs/commande/card.php
2015-11-11 17:23:37 +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
d06a445e01
[Qual] Uniformize code
2015-11-10 19:22:27 +01:00
frederic34
b8a84d68ec
add messages
2015-11-09 18:19:10 +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
Sergio Sanchis Climent
f6991dd3ec
Moving new fields at the end
2015-11-04 23:18:28 +01:00
Sergio Sanchis Climent
eba0fa1b96
When you create an "commande" from a "propal" lost $object->origin and $object->origin_id in hook
2015-11-04 22:38:45 +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
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
8426e2e506
FIX Can't reopen a canceled invoice.
2015-10-06 18:38:43 +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
Juanjo Menent
31230d296d
Merge remote-tracking branch 'upstream/3.8' into develop
2015-10-03 23:51:38 +02:00
Laurent Destailleur
d737fd1fd2
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-10-03 19:06:44 +02:00
Laurent Destailleur
31acab92a6
Doc comments
2015-10-03 18:48:51 +02:00
Laurent Destailleur
c0c0cc2415
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/interventions.lang
htdocs/theme/md_exp/style.css.php
2015-10-03 14:28:31 +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
60c0338d64
FIX #3628
2015-10-01 16:50:18 +02:00
Juanjo Menent
d503dd928b
Merge pull request #3597 from GPCsolutions/displaymargin
...
[Qual] Replaced deprecated displayMarginInfos()
2015-09-26 08:47:55 +02:00
Juanjo Menent
6999ad0a4f
Merge pull request #3587 from GPCsolutions/fiche_titre
...
[Qual] Replaced deprecated function calls.
2015-09-26 08:39:22 +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
Raphaël Doursenaud
9f2545b95d
[Qual] Replaced deprecated dol_clone by native clone
2015-09-24 17:24:40 +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
313d9ddacd
FIX #3534
2015-09-16 22:04:03 +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
a9289de616
Several fixes. Fix #2927
2015-07-13 11:22:18 +02:00
Laurent Destailleur
1fb40565f4
Fix bad parameters of function select_date
2015-07-12 12:50:24 +02:00
aspangaro
54d2a96d8e
dir DOL_URL_ROOT
2015-07-05 05:56:45 +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
Laurent Destailleur
9b7982bf0c
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/fourn/facture/card.php
htdocs/theme/eldy/style.css.php
2015-06-08 18:28:50 +02:00
Laurent Destailleur
02dbe16366
Mutualize code to show block to link an element to another one.
2015-06-06 15:57:59 +02:00
Regis Houssin
9a812a6c28
Fix: add filter for "dol_most_recent_files" for avoid conflict with
...
option "Save file on server with name "FA0700034-Original filename""
2015-06-06 13:03:02 +02:00
Laurent Destailleur
f42065146a
Start to clean html.form class.
2015-06-06 12:26:47 +02:00
Laurent Destailleur
f7eaf35d30
NEW When creating order, proposal or invoice from thirdparty card, the
...
project is asked during creation. A link to create project if it does
not exists is also available.
NEW Uniformize form creation of proposal to add public and private notes
during creation like done for order and invoice.
2015-06-03 11:55:39 +02:00
Laurent Destailleur
36b7f1dcf3
NEW Show photo of logged user into login top right block.
...
NEW If no photo is available for user, we show a generic photo depending
on gender
2015-05-30 19:50:07 +02:00
