Laurent Destailleur
f7f0059767
Missing hook to add button on intervention
...
Prepare to move location into resource
Can select which king of contact show into contact tab.
2014-09-22 20:16:58 +02:00
Marcos García de La Fuente
8f492a6677
Documented commonObject::commonGenerateDocument
2014-09-22 00:18:36 +02:00
Marcos García de La Fuente
bf7f4c1cab
Refactored generateDocument functions
2014-09-21 18:16:14 +02:00
Raphaël Doursenaud
332caa2b71
FIX: missing global declaration
2014-09-19 03:05:20 +02:00
Laurent Destailleur
83447243ae
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
build/debian/get-orig-source.sh
htdocs/product/class/product.class.php
htdocs/societe/soc.php
2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
build/debian/control
htdocs/compta/bank/account.php
htdocs/fourn/paiement/fiche.php
htdocs/product/class/product.class.php
htdocs/product/fiche.php
2014-09-15 22:52:59 +02:00
Laurent Destailleur
2dbbc76645
Fix: Trigger error not reported
2014-09-15 11:48:50 +02:00
Marcos García de La Fuente
7a28f8e4aa
[ bug #1555 ] Update accountancy code of products does not throw PRODUCT_MODIFY trigger
2014-09-14 13:59:06 +02:00
Laurent Destailleur
f264e25514
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/adherents/liste.php
htdocs/compta/bank/bankid_fr.php
htdocs/holiday/index.php
htdocs/opensurvey/list.php
2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214
Fix: SQL injection
2014-09-13 19:04:25 +02:00
Laurent Destailleur
154d1520fb
Generalize $inputalsopricewithtax instead of MAIN_FEATURES_LEVEL>1
2014-08-30 20:36:53 +02:00
aspangaro
f774ff487b
Merge branch 'Upstream/develop'
2014-08-18 11:56:49 +02:00
Laurent Destailleur
c17f5e7f00
Accept property fk_thirdparty instead of fk_soc
2014-08-14 16:04:42 +02:00
Laurent Destailleur
6b26ae6f1f
Fix: Header of tables must use th and not td
2014-08-14 13:30:44 +02:00
aspangaro
1a87d98357
Qual: Renamed table llx_c_civilite into llx_c_civility
...
field civilite into label in the same table and field civilite into civility in other table
2014-08-12 06:03:27 +02:00
Laurent Destailleur
1f2cc71975
New: Supervisor is now visible into user list.
2014-08-03 11:36:00 +02:00
frederic34
2df2c12cfd
The delivery method is transmited in shipment
2014-07-25 21:50:21 +02:00
frederic34
f0a7cc3268
Select Shipping Method in Propal
2014-07-24 18:08:08 +02:00
Laurent Destailleur
728ca22183
Merge pull request #1730 from GPCsolutions/accessibility
...
Accessibility
2014-07-11 14:57:02 +02:00
Raphaël Doursenaud
55d062784d
Added labels on objectline form elements
2014-07-11 13:25:44 +02:00
frederic34
c8e6387e52
Merge remote branch 'upstream/develop' into selectbank
...
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-07-08 22:46:38 +02:00
frederic34
9949713d20
Some cleaning
2014-07-07 18:40:18 +02:00
KreizIT
4e08e2b5d5
Fix rollback and test errno
2014-07-07 11:32:56 +02:00
frederic34
f29eeceb1a
Select bank account for propal and order
2014-07-06 20:49:34 +02:00
Laurent Destailleur
fa82cbceb9
Qual: Removed useless function
2014-07-05 08:59:41 +02:00
Marcos García de La Fuente
7e1cf124b8
Merge branch 'develop' into syslog
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/product/class/product.class.php
htdocs/product/stock/lib/replenishment.lib.php
htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
Laurent Destailleur
6f0250cb94
Fix: typo
2014-06-29 04:25:42 +02:00
Laurent Destailleur
29dfb71bbd
Merge branch 'patch-11' of github.com:defrance69/dolibarr into
...
defrance69-patch-11
Conflicts:
htdocs/core/class/commonobject.class.php
2014-06-26 23:04:26 +02:00
BENKE Charles
8acd702cd1
Using hidden constant to use the feature
...
MARGININFO_HIDE_SHOW = 0 feature not used
MARGININFO_HIDE_SHOW = 1 feature used, displayed on open
MARGININFO_HIDE_SHOW = 2 feature used, not displayed on open
2014-06-26 22:34:40 +02:00
KreizIT
92f1778c9d
Fix : [ bug #1459 ] _ADD_CONTACT and _DEL_CONTACT triggers do not intercept insertion when reported an error
...
Start refactoring trigger call from within object
2014-06-25 16:51:26 +02:00
Marcos García de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
ca0a6cb307
Removed SQL string from call debug log
2014-06-13 01:34:39 +02:00
Marcos García de La Fuente
7e7958cf73
Removed SQL errors as they are logged by the database handler
2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
Laurent Destailleur
b124007c8c
Merge remote-tracking branch 'origin/3.5' into develop
2014-06-09 15:30:41 +02:00
Laurent Destailleur
4c3c62515d
Fix: Confusion between is_int and is_numeric.
2014-06-09 15:21:20 +02:00
Laurent Destailleur
82a2a723c3
Fix: [ bug #1419 ] Margins module shows margin of sold services even if
...
services module is disabled
2014-05-29 21:01:00 +02:00
Laurent Destailleur
4b9d1b901b
Fix: [ bug #1401 ] Problème avec la génération des codes barres
2014-05-25 17:14:33 +02:00
Laurent Destailleur
8e7b310fb6
Fix: [ bug #1400 ] Silent Warning create a draft invoice
2014-05-25 05:01:14 +02:00
BENKE Charles
3d7b6e9a26
Update commonobject.class.php
2014-05-24 19:51:05 +02:00
guerinaxel
1dbcd215b8
Correcting log use for commonobject.class.php
...
Correcting dol_syslog use which had 3 parameters instead of 2.
2014-05-19 15:54:43 +02:00
BENKE Charles
c8067931e3
Update commonobject.class.php
2014-05-19 09:32:42 +02:00
BENKE Charles
b210d7a00f
Update commonobject.class.php
...
Hide the margintable if click at the top of it (usefull when customer are just in front of you), reappear when you click again
2014-05-18 14:59:20 +02:00
Laurent Destailleur
15796ec592
Fix: checkstyle errors
2014-05-14 12:19:45 +02:00
Laurent Destailleur
757d92a318
Merge pull request #1589 from aternatik/resource_core
...
Core integration of resource module
2014-05-14 11:25:25 +02:00
Laurent Destailleur
f621f7eb32
Fix: The rounding mode is now forced when provided explicitly and no
...
more by default (we keep data intact when no mode provided).
2014-05-13 13:22:29 +02:00
Laurent Destailleur
69eaefc459
Fix: The way we tested if a ref/id already exists was wrong. Introduce a
...
common static method for this. Removed verifNumRef method.
Fix: Add missing logs
2014-05-13 10:12:45 +02:00
Laurent Destailleur
18848eaf74
Clean forms
2014-05-12 13:25:36 +02:00
Laurent Destailleur
5fa05ee29d
Start to clean code of templates to input lines
2014-05-12 12:53:10 +02:00
BENKE Charles
8c8c641411
Update commonobject.class.php
...
$objecttype == 'order_supplier' already tested on the previous else if
2014-05-11 23:19:18 +02:00
