Florian HENRY
|
a510a1ef5c
|
First step add contract lines extrafields
|
2015-01-27 12:53:02 +01:00 |
|
frederic34
|
e18577aa62
|
Tooltip and lib for file cache
|
2015-01-24 21:46:05 +01:00 |
|
Laurent Destailleur
|
c4782f960c
|
Qual: Removed not cleand function
|
2015-01-22 19:47:53 +01:00 |
|
frederic34
|
f4161b457b
|
Add dol_escape_htmltag and start to adapt boxes
|
2015-01-22 00:23:55 +01:00 |
|
frederic34
|
1b0dd671b3
|
Add tooltip in getNomUrl link
|
2015-01-20 21:40:33 +01:00 |
|
Laurent Destailleur
|
e220ce5a82
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/comm/card.php
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/html.formcompany.class.php
htdocs/custom/.gitignore
htdocs/expedition/card.php
htdocs/fourn/card.php
htdocs/product/fournisseurs.php
|
2015-01-18 18:44:22 +01:00 |
|
Laurent Destailleur
|
5c5ff72ecd
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
htdocs/adherents/fiche.php
htdocs/comm/fiche.php
htdocs/comm/mailing/fiche.php
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/paiement.php
htdocs/core/class/html.formcompany.class.php
htdocs/core/tpl/login.tpl.php
htdocs/expedition/fiche.php
htdocs/fourn/commande/fiche.php
htdocs/fourn/facture/fiche.php
htdocs/fourn/facture/paiement.php
htdocs/fourn/fiche.php
htdocs/main.inc.php
htdocs/product/fournisseurs.php
htdocs/resource/card.php
|
2015-01-18 17:13:42 +01:00 |
|
Marcos García de La Fuente
|
41e01a22a3
|
Fixed loading of external numeration modules in Contrat, Commande, Facture, Contrat, Expedition, Fichinter, CommandeFournisseur and uniformized code
|
2015-01-17 18:58:05 +01:00 |
|
Laurent Destailleur
|
fc78d632d3
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/compta/facture.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/main.inc.php
|
2015-01-09 23:09:10 +01:00 |
|
frederic34
|
60661ae948
|
Add some "classfortooltip"
|
2015-01-09 00:07:54 +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
|
d8d01090cd
|
Fixed: Mark function as deprecated
|
2015-01-04 19:28:05 +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
|
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 |
|
Laurent Destailleur
|
613d1b381b
|
Doxygen
|
2014-12-27 01:10:42 +01:00 |
|
Laurent Destailleur
|
5ead994955
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
ChangeLog
|
2014-12-26 04:57:55 +01:00 |
|
Marcos García de La Fuente
|
1f00794c98
|
Fixed bug which didn't show documents in auto GED when an object had '/' in its ref
|
2014-12-25 21:47:39 +01:00 |
|
Frédéric FRANCE
|
8e06329f8d
|
Add css badge
|
2014-12-23 21:26:34 +01:00 |
|
Laurent Destailleur
|
2a3bb96c34
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/ecm.lib.php
|
2014-12-22 03:14:22 +01:00 |
|
Laurent Destailleur
|
8996953077
|
Fix: error reported by scrutinizer
|
2014-12-20 15:42:03 +01:00 |
|
Laurent Destailleur
|
53c2086d4b
|
Merge pull request #2147 from csv115/develop_hook_contract
hooks more button function on contract card
|
2014-12-18 22:39:21 +01:00 |
|
Laurent Destailleur
|
711b033844
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/contrat/card.php
htdocs/core/class/html.form.class.php
htdocs/product/stock/card.php
|
2014-12-14 12:35:13 +01:00 |
|
csv115
|
bc4e6d4c7e
|
hooks more button function on contract card
|
2014-12-11 16:17:37 +01:00 |
|
Laurent Destailleur
|
036914756b
|
Fixed: option CONTRACT_SUPPORT_PRODUCTS not correctly supported
|
2014-12-11 14:15:40 +01:00 |
|
Laurent Destailleur
|
a4e0de0d8a
|
Fixed: Contract must use serpis if no config set
Fixed: Missing fetch_thirdparty.
|
2014-12-11 13:12:05 +01:00 |
|
Laurent Destailleur
|
a724c3aa70
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/main.inc.php
|
2014-11-28 02:26:40 +01:00 |
|
Laurent Destailleur
|
06894a196c
|
Merge pull request #2112 from frederic34/patch-2
Put form outside table
|
2014-11-28 01:18:54 +01:00 |
|
Marcos García de La Fuente
|
1c16a2e621
|
Fixed [ bug #1642 ]: add a free line in contract
|
2014-11-28 01:15:45 +01:00 |
|
Laurent Destailleur
|
44b81ad29c
|
Merge pull request #2074 from marcosgdf/bug-1642
Fixed [ bug #1642 ]: add a free line in contract
|
2014-11-28 01:14:23 +01:00 |
|
Laurent Destailleur
|
79c8980493
|
Fix: function at wrong place
|
2014-11-28 01:13:57 +01:00 |
|
Frédéric FRANCE
|
523afc3943
|
Put form outside table
|
2014-11-28 00:57:40 +01:00 |
|
aspangaro
|
c4c69e191b
|
Replace <center> tags
|
2014-11-25 20:13:43 +01:00 |
|
Frédéric FRANCE
|
d57344a2e7
|
Update /contrat/list.php
|
2014-11-23 17:43:48 +01:00 |
|
Frédéric FRANCE
|
c97e95f6ab
|
Update /contrat/services.php
|
2014-11-23 17:43:44 +01:00 |
|
Marcos García de La Fuente
|
9f73277ef2
|
Fixed [ bug #1642 ]: add a free line in contract
|
2014-11-23 13:14:54 +01:00 |
|
Frédéric FRANCE
|
7442b1a6b1
|
Update /contrat/list.php
|
2014-11-23 09:34:56 +01:00 |
|
Frédéric FRANCE
|
6f3ce0a63b
|
Update /contrat/services.php
|
2014-11-23 09:34:20 +01:00 |
|
Laurent Destailleur
|
43f3e28fd6
|
Fixed: [ bug #1645 ] Can't list contracts
|
2014-11-22 15:12:36 +01:00 |
|