Laurent Destailleur
|
7a0206adce
|
FIX Missing to set context into workflow actions, so triggers can't know
we are creating an invoice from order or an order from a proposal.
|
2015-11-08 14:37:50 +01:00 |
|
Laurent Destailleur
|
fe78996026
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/product/stock/fiche.php
htdocs/product/stock/valo.php
|
2015-11-05 22:04:18 +01:00 |
|
Laurent Destailleur
|
375e61de2e
|
Merge 3.5
|
2015-11-05 22:01:05 +01:00 |
|
Laurent Destailleur
|
5777c16b72
|
Merge pull request #3902 from altatof/clonedorderdate
FIX: change order date on clone (as everywhere else)
|
2015-11-05 21:49:50 +01:00 |
|
Laurent Destailleur
|
fdf9617e42
|
Merge pull request #3900 from GPCsolutions/dolibarr-3864
Fix #3864 Really fixed invalid jQuery code
|
2015-11-05 21:47:40 +01:00 |
|
Laurent Destailleur
|
d499fafdb9
|
Merge pull request #3901 from altatof/3.6
FIX bad calculation for stock value
|
2015-11-05 21:44:21 +01:00 |
|
Laurent Destailleur
|
60debe31c4
|
Merge pull request #3894 from altatof/stockvalue
FIX bad calculation for stock value
|
2015-11-05 21:44:15 +01:00 |
|
Laurent Destailleur
|
cbff03ca08
|
Merge pull request #3892 from atm-alexis/3.7_FIX_data_lose_event_userassigned
FIX event's data lost on user assign update
|
2015-11-05 21:36:34 +01:00 |
|
Christophe Battarel
|
316b7453e4
|
FIX bad stock valo
|
2015-11-05 17:04:08 +01:00 |
|
Christophe Battarel
|
80d2445540
|
FIX: bad stock valorisation
|
2015-11-05 17:00:22 +01:00 |
|
Christophe Battarel
|
ad82135879
|
FIX: change order date on clone (as everywhere else)
|
2015-11-05 15:36:13 +01:00 |
|
Christophe Battarel
|
75bcb7e53f
|
fix pmp
|
2015-11-05 15:32:56 +01:00 |
|
Christophe Battarel
|
f566b38296
|
FIX pmp
|
2015-11-05 15:29:51 +01:00 |
|
Christophe Battarel
|
fa088eb6cc
|
FIX bad calculation for stock value
|
2015-11-05 14:57:58 +01:00 |
|
Raphaël Doursenaud
|
b0cf9bd0be
|
Fix #3864 Really fixed invalid jQuery code
|
2015-11-05 14:38:11 +01:00 |
|
Christophe Battarel
|
9b797c1831
|
FIX bad calculation for stock value
|
2015-11-05 12:49:43 +01:00 |
|
Alexis Algoud
|
e1ea2215a3
|
FIX loss data also if update was cancel by error of ended state with no end date, try a generic patch
|
2015-11-05 11:25:04 +01:00 |
|
Alexis Algoud
|
0543a31920
|
FIX event's data lost on user assign update
|
2015-11-05 11:11:03 +01:00 |
|
Laurent Destailleur
|
fb34f25701
|
Merge pull request #3887 from GPCsolutions/dolibarr-3864
Fix #3864 Fixed invalid jQuery code
|
2015-11-05 02:34:24 +01:00 |
|
Raphaël Doursenaud
|
69ac75bef8
|
Fix #3864 Fixed invalid jQuery code
|
2015-11-04 22:55:14 +01:00 |
|
Laurent Destailleur
|
38ed83d05f
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/core/lib/company.lib.php
|
2015-11-02 19:19:05 +01:00 |
|
Laurent Destailleur
|
c06c2d0464
|
FIX #3841 creation of a task completed has not status set to finished by
default
|
2015-11-02 14:21:45 +01:00 |
|
Juanjo Menent
|
64ff12c009
|
Merge pull request #3835 from atm-maxime/fix_product_stats
Fix : stats were wrong if same product on several lines
|
2015-10-30 22:18:48 +01:00 |
|
Maxime Kohlhaas
|
c46f9350a5
|
Fix : stats were wrong if same product on several lines with same quantity because of distinct
|
2015-10-30 09:50:04 +01:00 |
|
Laurent Destailleur
|
bd69830cbd
|
Merge pull request #3803 from atm-robin/3.7_fix_supplier_rights
FIX supplier rights for orderToInvoice
|
2015-10-26 22:46:12 +01:00 |
|
atm-robin
|
29b8919a40
|
FIX supplier rights for orderToInvoice
|
2015-10-26 14:34:46 +01:00 |
|
Juanjo Menent
|
d192ed9676
|
Merge pull request #3761 from frederic34/patch-18
Fix getFullName() on a non-object in notify.class.php
|
2015-10-18 11:50:04 +02:00 |
|
Frédéric FRANCE
|
6f4cfc86e8
|
Update notify.class.php
http://www.dolibarr.fr/forum/12-howto--aide/54061-probleme-sur-la-validation-des-commande-fournisseu
Fatal error: Call to a member function getFullName() on a non-object in /home/xxxx/public_html/xxxxx/htdocs/core/class/notify.class.php on line 374
|
2015-10-18 11:25: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 |
|
Laurent Destailleur
|
5d585fa04a
|
Merge pull request #3729 from FHenry/3.7
FIX : #3724 Bug: Blank page after cloning proposal with changed client
|
2015-10-14 21:32:26 +02:00 |
|
Laurent Destailleur
|
f08d52b0e8
|
Merge pull request #3723 from atm-alexis/FIX_double_escape_entrepot
FIX double db escape add too quote
|
2015-10-14 21:27:39 +02:00 |
|
Florian HENRY
|
727db56576
|
FIX : #3724 Bug: Blank page after cloning proposal with changed client
|
2015-10-14 08:27:56 +02:00 |
|
Alexis Algoud
|
0251728e28
|
FIX double db escape add too quote
|
2015-10-12 17:36:24 +02:00 |
|
Laurent Destailleur
|
84f5b72d2b
|
Merge pull request #3719 from Dolibarr/revert-3573-FIX_remove_file_from_mail_remove_file
Revert "FIX no need to remove file into mail form"
|
2015-10-11 20:43:16 +02:00 |
|
Laurent Destailleur
|
87fad70f4a
|
Revert "FIX no need to remove file into mail form"
|
2015-10-11 20:42:49 +02:00 |
|
Laurent Destailleur
|
62dd936b08
|
Merge pull request #3573 from atm-alexis/FIX_remove_file_from_mail_remove_file
FIX no need to remove file into mail form
|
2015-10-11 20:42:42 +02:00 |
|
Laurent Destailleur
|
9fa2afb44b
|
Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6
Conflicts:
ChangeLog
|
2015-10-11 19:55:50 +02:00 |
|
Laurent Destailleur
|
4e4efc97f0
|
Merge branch 'marcosgdf-bug-1776' into 3.6
|
2015-10-11 19:54:51 +02:00 |
|
Laurent Destailleur
|
c76af687ed
|
Merge pull request #3715 from marcosgdf/clone-proposals
FIX 1794 Error when cloning Proposal gives error in a malformed page
|
2015-10-11 19:52:30 +02:00 |
|
Marcos García de La Fuente
|
fd9f51df88
|
Missing changelog
|
2015-10-11 12:39:42 +02:00 |
|
Marcos García de La Fuente
|
4e9a378f0d
|
Merge branch '3.6' into bug-1776
|
2015-10-11 12:37:41 +02:00 |
|
Marcos García de La Fuente
|
9f1fa7e212
|
Missing changelog
|
2015-10-11 12:32:02 +02:00 |
|
Marcos García de La Fuente
|
252f00dfe7
|
Merge branch '3.6' into clone-proposals
|
2015-10-11 12:29:45 +02:00 |
|
Laurent Destailleur
|
3f8e9bd181
|
Remove warning
|
2015-10-10 19:24:31 +02:00 |
|
Laurent Destailleur
|
384c89dcef
|
Merge pull request #3701 from altatof/fix_orderdateonclone
FIX: change order date on clone (as everywhere else)
|
2015-10-09 20:44:03 +02:00 |
|
Laurent Destailleur
|
279e7028fb
|
Merge pull request #3686 from grandoc/3.7
3.7
|
2015-10-09 20:38:16 +02:00 |
|
Laurent Destailleur
|
f9485bd25b
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/core/class/extrafields.class.php
|
2015-10-09 20:35:17 +02:00 |
|
Laurent Destailleur
|
b27989d5d4
|
Merge pull request #3665 from altatof/fix_extrafields
reenable search criteria in sql clause
|
2015-10-09 20:32:42 +02:00 |
|
Laurent Destailleur
|
c675f88dda
|
Merge pull request #3678 from GPCsolutions/3.7-calcul_price_total-warning
[Qual] Prevent warning
|
2015-10-09 20:29:24 +02:00 |
|
Laurent Destailleur
|
e886c89e06
|
Merge pull request #3668 from altatof/fix_stock_entity
fix entities warehouse share
|
2015-10-09 20:16:32 +02:00 |
|