aspangaro
|
06f752b250
|
Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy
|
2015-11-16 06:50:04 +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
|
c7546dbad2
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-11-13 11:13:04 +01:00 |
|
Laurent Destailleur
|
b3be7f65cd
|
Fix syntax error . = instead of .=
|
2015-11-13 11:12:49 +01:00 |
|
Laurent Destailleur
|
f65829ec42
|
Merge pull request #3970 from hregis/3.7_bug
Fix: wrong var name
|
2015-11-12 18:33:12 +01:00 |
|
Regis Houssin
|
52bd90f950
|
Fix: wrong var name
|
2015-11-12 14:12:56 +01:00 |
|
Laurent Destailleur
|
350345ecca
|
Prepare 3.6.5
|
2015-11-08 15:18:26 +01:00 |
|
Laurent Destailleur
|
722a133b31
|
FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.6.5
Conflicts:
ChangeLog
Conflicts:
ChangeLog
|
2015-11-08 15:09:57 +01:00 |
|
Laurent Destailleur
|
d4aeb8b3bc
|
Abandon package APS. Was never used.
|
2015-11-08 14:57:26 +01:00 |
|
Laurent Destailleur
|
04aba8ce96
|
Abandon package APS. Was never used.
|
2015-11-08 14:56:36 +01:00 |
|
Laurent Destailleur
|
9b8bb114cd
|
FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.7.2
Conflicts:
ChangeLog
|
2015-11-08 14:55:12 +01:00 |
|
Laurent Destailleur
|
c639e82062
|
FIX Add a protection to not make release if ChangeLog was not generated.
Conflicts:
ChangeLog
|
2015-11-08 14:45:56 +01:00 |
|
Laurent Destailleur
|
e6ab6bdb8e
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-11-08 14:38:01 +01:00 |
|
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 |
|
Juanjo Menent
|
0ce7cad48c
|
Merge pull request #3946 from aspangaro/3.7-1
Fix: Accountancy compatibility with subtotal & jalon module
|
2015-11-08 11:26:06 +01:00 |
|
Juanjo Menent
|
7673a73a65
|
Merge pull request #3939 from marcosgdf/bug-3836
FIX #3836 Unable to upload a document to an invoice under some circunstances
|
2015-11-08 11:21:16 +01:00 |
|
Juanjo Menent
|
8377d6967a
|
Merge pull request #3934 from marcosgdf/bug-3679
FIX #3679 Error when deleting a Localtax2 special payment
|
2015-11-08 11:16:07 +01:00 |
|
Juanjo Menent
|
a6f0baefc1
|
Merge pull request #3933 from marcosgdf/bug-3980
FIX #3890 Expected transactions bank account page, shows negative numbers
|
2015-11-08 11:15:31 +01:00 |
|
Juanjo Menent
|
0cab08b2f3
|
Merge pull request #3932 from marcosgdf/bug-3707
FIX #3707 Thirdparty bank account page table has a glitch
|
2015-11-08 11:14:39 +01:00 |
|
Juanjo Menent
|
d69e76168f
|
Merge pull request #3929 from marcosgdf/bug-3928
FIX #3928 Creating a Customer order and a Customer invoice from a project, does not inherit payment conditions and method of payment of customer card
|
2015-11-08 11:14:02 +01:00 |
|
aspangaro
|
f0a3bca4c2
|
Fix: Accountancy compatibility with subtotal & jalon module
|
2015-11-08 04:22:49 +01:00 |
|
Marcos García de La Fuente
|
4a52d3c1b1
|
Removed unwanted change
|
2015-11-07 15:35:00 +01:00 |
|
Marcos García de La Fuente
|
84a152dc2e
|
FIX #3836 Unable to upload a document to an invoice under some circunstances
|
2015-11-07 15:33:48 +01:00 |
|
Marcos García de La Fuente
|
01854b3259
|
FIX #3679 Error when deleting a Localtax2 special payment
|
2015-11-07 13:51:09 +01:00 |
|
Marcos García de La Fuente
|
728f469c1e
|
FIX #3890 Expected transactions bank account page, shows negative numbers
|
2015-11-07 13:43:59 +01:00 |
|
Marcos García de La Fuente
|
3bbedf1795
|
FIX #3707 Thirdparty bank account page table has a glitch
|
2015-11-07 13:39:34 +01:00 |
|
Marcos García de La Fuente
|
b4c3804c91
|
FIX #3928 Creating a Customer order and a Customer invoice from a project, does not inherit payment conditions and method of payment of customer card
|
2015-11-07 13:21:03 +01:00 |
|
Juanjo Menent
|
f33157033c
|
Merge pull request #3909 from altatof/fixcloseshipping
FIX: change object statut on close shipping and remove erratic db commit
|
2015-11-06 10:16:00 +01:00 |
|
Juanjo Menent
|
87a102f5c8
|
Merge pull request #3910 from FHenry/3.7
FIX : only active customer should be available into select list thirdparty on invoice creation
|
2015-11-06 10:14:44 +01:00 |
|
Christophe Battarel
|
4d11205a01
|
FIX: change object statut on close shipping and remove erratic db commit
|
2015-11-06 09:51:33 +01:00 |
|
Florian HENRY
|
600dbced7e
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-11-06 09:49:48 +01:00 |
|
Florian HENRY
|
8d829dca32
|
FIX : only active customer should be return into new invoice creation
select list
|
2015-11-06 09:49:02 +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 |
|