Laurent Destailleur
|
dbcaeb01c0
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
|
2015-01-09 22:40:45 +01:00 |
|
Laurent Destailleur
|
32edb33411
|
Start 3.6.3
|
2015-01-09 22:32:25 +01:00 |
|
Laurent Destailleur
|
068ae7f0d4
|
- Fix: ref_ext was not saved when recording a customer order from web
service
|
2015-01-09 22:32:00 +01:00 |
|
Laurent Destailleur
|
f54e90c9cf
|
Better doc to install external modules.
Custom dir will be installed by default.
|
2015-01-09 13:00:10 +01:00 |
|
Laurent Destailleur
|
b220bb7b1d
|
Fixed: Size too low
|
2015-01-07 11:14:51 +01:00 |
|
Laurent Destailleur
|
f8792bdbc7
|
Fixed: Add opensurvey into list of reloaded modules for 3.7
|
2015-01-07 11:11:40 +01:00 |
|
Laurent Destailleur
|
4ee308c77b
|
Fixed: Filter lost after search on date
|
2015-01-06 20:58:23 +01:00 |
|
Laurent Destailleur
|
2bf2c8fce7
|
Restore all requets
|
2015-01-06 00:34:23 +01:00 |
|
Laurent Destailleur
|
033757aafd
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/commande/fiche.php
htdocs/compta/facture.php
|
2015-01-06 00:33:28 +01:00 |
|
Laurent Destailleur
|
4ce7a27dca
|
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
|
2015-01-06 00:28:07 +01:00 |
|
Laurent Destailleur
|
a668d163fd
|
Repair corrupted data
|
2015-01-06 00:27:35 +01:00 |
|
Laurent Destailleur
|
b919318b53
|
Merge pull request #2213 from marcosgdf/opensurvey
Fixed error deleting survey comment
|
2015-01-06 00:21:32 +01:00 |
|
Laurent Destailleur
|
443c9d245e
|
Merge pull request #2212 from marcosgdf/misc-doc
Miscellaneous corrections
|
2015-01-06 00:21:05 +01:00 |
|
Laurent Destailleur
|
908a95d83f
|
Merge pull request #2211 from marcosgdf/contract-fixes
Several Contract-related fixes
|
2015-01-06 00:18:51 +01:00 |
|
Laurent Destailleur
|
3f7aab93e5
|
Merge pull request #2204 from defrance69/patch-39
Update facture.php
|
2015-01-06 00:14:42 +01:00 |
|
Laurent Destailleur
|
e5f81b1fec
|
Merge pull request #2202 from defrance69/patch-38
Update facture.php
|
2015-01-06 00:13:55 +01:00 |
|
Laurent Destailleur
|
337d055872
|
Merge pull request #2199 from altatof/3.6
FIX: dont remove price ht if it is forced (ie: calculated by margin rate and cost price, or by external module)
|
2015-01-06 00:10:08 +01:00 |
|
Laurent Destailleur
|
561ace5b0c
|
Merge pull request #2219 from ndrosis/patch-11
Fix Lang for Check Payment Type
|
2015-01-06 00:07:38 +01:00 |
|
Laurent Destailleur
|
6a6c5c54f1
|
Merge pull request #2220 from aspangaro/3.7-Auguria
Add module accountancy expert in auguria menu
|
2015-01-06 00:07:26 +01:00 |
|
Laurent Destailleur
|
256cd68404
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-01-06 00:04:51 +01:00 |
|
Laurent Destailleur
|
3794c9305e
|
Fix: [ bug #1754 ] Error while installing 3.7
|
2015-01-06 00:04:23 +01:00 |
|
Laurent Destailleur
|
5032f88e9f
|
Merge pull request #2221 from aspangaro/3.7-Skype
Skype :: Better presentation
|
2015-01-05 23:52:28 +01:00 |
|
aspangaro
|
b4b5b35afa
|
Skype :: Better presentation
|
2015-01-04 20:17:49 +01:00 |
|
Laurent Destailleur
|
d8d01090cd
|
Fixed: Mark function as deprecated
|
2015-01-04 19:28:05 +01:00 |
|
Laurent Destailleur
|
c0b5b9f00b
|
Fixed: Removed deprecated function
|
2015-01-04 19:26:51 +01:00 |
|
Laurent Destailleur
|
48818ed2fd
|
Fixed: Quick solution to solve problem of unknown payment amount for
online subscription.
|
2015-01-04 15:40:01 +01:00 |
|
Laurent Destailleur
|
df3987fa10
|
Fixed: Bad url link with jquery mobile. We must add rel="external" on
all external links.
|
2015-01-04 14:51:16 +01:00 |
|
aspangaro
|
f14ea7b649
|
Add module accountancy expert in auguria menu
|
2015-01-03 15:07:54 +01:00 |
|
Drosis Nikos
|
68049a2f0e
|
Fix Lang for Check Payment Type
|
2015-01-02 18:10:47 +02:00 |
|
Laurent Destailleur
|
be34fcfa8a
|
Removed duplicate link making same thing
|
2014-12-30 21:33:56 +01:00 |
|
Laurent Destailleur
|
410c8e56c6
|
Better fix
|
2014-12-30 04:30:32 +01:00 |
|
Laurent Destailleur
|
3848daeab8
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/filefunc.inc.php
htdocs/product/stats/facture.php
|
2014-12-30 04:20:50 +01:00 |
|
Marcos García de La Fuente
|
a9a33479f1
|
Fixed error deleting survey comment
|
2014-12-29 03:44:03 +01:00 |
|
Marcos García de La Fuente
|
86100758ff
|
Miscellaneous corrections
|
2014-12-28 20:13:15 +01:00 |
|
Marcos García de La Fuente
|
2202380bc2
|
Improving ContratLigne documentation
|
2014-12-28 19:36:43 +01:00 |
|
Marcos García de La Fuente
|
7424ee1107
|
Improving Contrat documentation and fixed some properties usage
|
2014-12-28 19:28:25 +01:00 |
|
Marcos García de La Fuente
|
ef4d710f78
|
Improving CommonObject and Contrat documentation
|
2014-12-28 19:16:14 +01:00 |
|
Marcos García de La Fuente
|
ec7bc21e4c
|
Fixed undefined variable $pu_ht
|
2014-12-28 19:01:39 +01:00 |
|
Marcos García de La Fuente
|
0b4bddd738
|
Fix [ bug #1779 ] Undefined variable $localtaxtx1 and $localtaxtx2 in Contrat::updateline
|
2014-12-28 18:57:59 +01:00 |
|
Marcos García de La Fuente
|
7670ae46a6
|
Fix [ bug #1778 ] Cancel button of edit ref. supplier contract card saves changes instead of cancelling
|
2014-12-28 18:56:23 +01:00 |
|
Marcos García de La Fuente
|
de137dd012
|
Merge branch 'bug-1767' into bug-1774
|
2014-12-28 18:16:16 +01:00 |
|
Marcos García de La Fuente
|
1a827a87f3
|
Merge branch 'bug-1775' into bug-1774
|
2014-12-28 18:16:02 +01:00 |
|
Marcos García de La Fuente
|
df1f931ab8
|
Fixed: [ bug #1767 ] Contract document is not generated properly
|
2014-12-28 18:10:41 +01:00 |
|
Marcos García de La Fuente
|
52b8bb350e
|
Fixed Contrat::fetch not setting Contrat::date_creation and improved class doc
|
2014-12-28 18:10:30 +01:00 |
|
Marcos García de La Fuente
|
cd468b65fd
|
Documented Contrat class
|
2014-12-28 17:55:21 +01:00 |
|
Laurent Destailleur
|
e70b6714ce
|
Doxygen
(cherry picked from commit 613d1b3)
|
2014-12-28 17:50:38 +01:00 |
|
Marcos García de La Fuente
|
584be6a589
|
Fixed Contrat::fetch
|
2014-12-28 17:47:13 +01:00 |
|
Marcos García de La Fuente
|
b9d6f2a496
|
Fix: [ bug #1775 ] New lines can be entered after contract validation
|
2014-12-28 17:43:25 +01:00 |
|
Marcos García de La Fuente
|
d4e7a97fdb
|
Fix: [ bug #1774 ] PHP Fatal error when creating a contract with Product module not enabled
|
2014-12-28 17:31:27 +01:00 |
|
BENKE Charles
|
2957c1445e
|
Update facture.php
$soc already filled upper if $socid filled
|
2014-12-28 12:34:21 +01:00 |
|