Laurent Destailleur
e3a8041b0d
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/facture.php
htdocs/user/fiche.php
2014-11-16 15:46:08 +01:00
Laurent Destailleur
64a2cce7c0
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-11-16 14:11:19 +01:00
Laurent Destailleur
ad661256c0
Fix: Bugs reported by scrutinizer
2014-11-15 16:20:03 +01:00
Laurent Destailleur
2aeb0f4f5b
Merge pull request #1941 from jfefe/patch-3
...
Avoid missing class error for fetch_thirdparty method
2014-11-15 12:36:41 +01:00
Laurent Destailleur
1dcca6e553
Avoid error
2014-11-08 00:49:52 +01:00
Christophe Battarel
44882f4035
improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option
2014-11-05 17:03:53 +01:00
Laurent Destailleur
5e0946bdc2
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/adherents/fiche.php
htdocs/core/lib/date.lib.php
htdocs/langs/fr_FR/bills.lang
htdocs/resource/class/resource.class.php
2014-11-05 16:37:07 +01:00
Laurent Destailleur
4f08408065
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
ChangeLog
htdocs/core/class/commonobject.class.php
2014-11-05 16:28:44 +01:00
Laurent Destailleur
cf6a0df3e4
A lot of fix in missing intervention trigger. Align key to use same name
...
to avoid future bugs.
2014-11-03 17:23:02 +01:00
Laurent Destailleur
82812aa679
Merge pull request #1970 from FHenry/develop
...
Add hook method to simply display child lines in order/invoice/propal
2014-10-30 18:11:41 +01:00
Philippe GRAND
463904706b
better display margin infos
2014-10-23 15:02:49 +02:00
jfefe
29db45c763
Avoid missing class error for fetch_thirdparty method
2014-10-23 01:15:05 +02:00
Florian HENRY
1eba744e8b
Add hook method to simply display child lines in order/invoice/propal
2014-10-20 13:15:48 +02:00
Laurent Destailleur
8581e953f9
Doxygen
2014-10-17 14:45:12 +02:00
Laurent Destailleur
536b579b35
Clean code
2014-10-14 00:27:23 +02:00
jfefe
6a4468d94e
Not need to test if class exists with require_once
2014-10-06 14:18:28 +02:00
jfefe
87fc27c7e6
Avoid missing class error for fetch_thirdparty method
2014-10-06 13:31:01 +02:00
Laurent Destailleur
c69565fd69
Fix: column name should not be an numeric
2014-10-03 03:12:39 +02:00
Laurent Destailleur
8ccb581185
Fix: Change for php 5.6
...
New: Management of color into type of events dictionnary (visible into
peruser view).
New: Can disable predefined type of events.
2014-09-29 13:21:03 +02:00
Laurent Destailleur
74cba062b4
Add a TODO to explain why we keep some extends into class.
...
Should be removed once php min will be 5.4.
2014-09-23 19:37:59 +02:00
Laurent Destailleur
dc96e10215
Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into
...
marcosgdf-oop-pdf
Conflicts:
htdocs/projet/class/project.class.php
2014-09-23 00:02:19 +02:00
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
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
