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 |
|
Marcos García de La Fuente
|
98ed747671
|
Fix: [ bug #1765 ] Unable to create a contract
|
2014-12-28 17:17:08 +01:00 |
|
Marcos García de La Fuente
|
f738863e51
|
Revert previous commit
|
2014-12-28 17:14:11 +01:00 |
|
Marcos García de La Fuente
|
1b693fae7f
|
Merge branch '3.7' into bug-1765
|
2014-12-28 17:11:30 +01:00 |
|
BENKE Charles
|
2957c1445e
|
Update facture.php
$soc already filled upper if $socid filled
|
2014-12-28 12:34:21 +01:00 |
|
BENKE Charles
|
191d4467e3
|
Update facture.php
$soc already filled upper when $socid send
|
2014-12-28 12:31:27 +01:00 |
|
Christophe Battarel
|
1ab6955494
|
FIX: dont remove price ht if it is forced (ie: calculated by margin rate
and cost price, or by external module)
|
2014-12-27 11:27:41 +01:00 |
|
Laurent Destailleur
|
c7937a9962
|
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
|
2014-12-27 02:22:09 +01:00 |
|
Laurent Destailleur
|
953e736a97
|
Prepare version 3.6.2
|
2014-12-27 02:21:37 +01:00 |
|
Laurent Destailleur
|
41118a174a
|
Merge pull request #2195 from marcosgdf/bug-1714
Fix [ bug #1714 ] Id "sall" is used twice in different HTML tags
|
2014-12-26 22:11:37 +01:00 |
|
Marcos García de La Fuente
|
95c7ba33ba
|
Merge branch '3.7' into bug-1765
|
2014-12-26 12:10:38 +01:00 |
|
Marcos García de La Fuente
|
9f6f90275a
|
Fix [ bug #1714 ] Id "sall" is used twice in different HTML tags
|
2014-12-26 12:03:29 +01:00 |
|
Juanjo Menent
|
bdf5f5726f
|
Fix: Bad order field value
|
2014-12-26 09:29:27 +01:00 |
|
Juanjo Menent
|
d40229e9cc
|
Fix: Bad order field value
|
2014-12-26 09:14:19 +01:00 |
|
Laurent Destailleur
|
657fc1b91c
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
htdocs/comm/fiche.php
htdocs/core/lib/functions2.lib.php
htdocs/fourn/fiche.php
htdocs/langs/fr_FR/compta.lang
htdocs/projet/element.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/time.php
|
2014-12-26 04:44:15 +01:00 |
|
Laurent Destailleur
|
75dbcf4a78
|
Fixed: doxygen
|
2014-12-26 04:35:48 +01:00 |
|
Laurent Destailleur
|
d18770c1e7
|
Merge remote-tracking branch 'origin/3.5' into 3.6
|
2014-12-26 04:16:08 +01:00 |
|
Laurent Destailleur
|
0e952c67ff
|
Merge pull request #2193 from marcosgdf/bug-1761
Fix: [ bug #1761 ] SQL error when installing 3.7 with PostgreSQL
|
2014-12-26 04:14:03 +01:00 |
|
Laurent Destailleur
|
490b0c5f3a
|
Merge branch 'marcosgdf-bug-1768' into 3.5
|
2014-12-26 04:13:36 +01:00 |
|
Laurent Destailleur
|
77e48f8c3e
|
Merge branch 'bug-1768' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1768
|
2014-12-26 04:12:58 +01:00 |
|
Laurent Destailleur
|
882fd9a798
|
Merge branch 'marcosgdf-bug-1757' into 3.5
|
2014-12-26 04:11:30 +01:00 |
|
Laurent Destailleur
|
38c9d39c2b
|
Merge branch 'bug-1757' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1757
Conflicts:
ChangeLog
|
2014-12-26 04:11:15 +01:00 |
|
Laurent Destailleur
|
4e2c321e4d
|
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
Conflicts:
ChangeLog
|
2014-12-26 04:09:08 +01:00 |
|