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 |
|
Frédéric FRANCE
|
56dd276504
|
Enhance search_categories with select2
|
2014-12-28 15:17:54 +01:00 |
|
frederic34
|
9c2c338dc0
|
Typo on variable
|
2014-12-28 14:21:54 +01:00 |
|
BENKE Charles
|
da0d0838e2
|
Update card.php
don't show line with empty duration when FICHINTER_HIDE_EMPTY_DURATION is active
|
2014-12-28 13:20:51 +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 |
|
frederic34
|
e937039596
|
Merge remote branch 'upstream/develop' into printipp
|
2014-12-28 11:59:58 +01:00 |
|
frederic34
|
310be3d3b6
|
Update lib with github.com/mfly/php-ipp
|
2014-12-28 11:29:53 +01:00 |
|
Ion Agorria
|
bdd7e9df23
|
Added searching using year
|
2014-12-28 03:39:30 +01:00 |
|
Ion Agorria
|
af15fe7dad
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2014-12-28 02:54:51 +01:00 |
|
Ion Agorria
|
250a995de8
|
Bug?
|
2014-12-28 02:54:42 +01:00 |
|
Ion Agorria
|
5bbcb58b44
|
Added expressions for product/service prices
|
2014-12-28 01:26:41 +01:00 |
|
Frédéric FRANCE
|
6e69d5c4bd
|
Typo
|
2014-12-27 11:28:10 +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 |
|
Frédéric FRANCE
|
dc18759c6c
|
Attribut width not allowed with div or span
|
2014-12-27 11:15:26 +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
|
36f5715e47
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2014-12-27 01:13:30 +01:00 |
|
Laurent Destailleur
|
613d1b381b
|
Doxygen
|
2014-12-27 01:10:42 +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 |
|
Laurent Destailleur
|
29db4d4670
|
Merge pull request #2194 from atm-maxime/develop
in PDF, no line jump after doc linked ref. Fix bug 1605.
|
2014-12-26 22:07:55 +01:00 |
|
Laurent Destailleur
|
0496d81b6a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2014-12-26 22:04:41 +01:00 |
|
Laurent Destailleur
|
5d80061caf
|
Mark property error as deprecated
|
2014-12-26 22:04:16 +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 |
|
Maxime Kohlhaas
|
e7ebb78ffd
|
in PDF, no line jump after doc linked ref. Fix bug 1605.
|
2014-12-26 11:09:46 +01:00 |
|
Juanjo Menent
|
a901329a7d
|
Fix: Bad order field value
|
2014-12-26 09:43:55 +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
|
d8557d8af0
|
Fixed: label
|
2014-12-26 05:16:00 +01:00 |
|
Laurent Destailleur
|
5ead994955
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
ChangeLog
|
2014-12-26 04:57:55 +01:00 |
|