Marcos García de La Fuente
530186c59d
PHPDoc and misc fixes for several folders
2015-02-10 13:32:00 +01:00
Marcos García de La Fuente
0d6d98b395
PHPDoc and misc fixes for several folders
2015-02-10 13:17:37 +01:00
Laurent Destailleur
443c9d245e
Merge pull request #2212 from marcosgdf/misc-doc
...
Miscellaneous corrections
2015-01-06 00:21:05 +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
ef4d710f78
Improving CommonObject and Contrat documentation
2014-12-28 19:16:14 +01:00
Marcos García de La Fuente
2616deb58d
Copyright info
2014-12-25 22:52:11 +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
Laurent Destailleur
acf7b9f130
Because this is a legal issue (OPCA), i added the hidden constant for
...
3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button
"Classified Billed" is visible on proposal even if there is no invoice
linked to proposal.
Fixed: Also fix get list of invoice that report too many data.
2014-12-23 12:59:34 +01:00
Laurent Destailleur
b5d74372de
Bad var
2014-12-04 01:36:53 +01:00
Laurent Destailleur
20e76aa4e6
Fixed: Use constant to hide a feature that will probably be broken. Also
...
it is a superfluous feature.
2014-11-30 02:05:45 +01:00
Laurent Destailleur
671243e8f6
Fixed: Bugs reported by scrutinizer
...
Fixed: Solve conflict between ->iban and ->iban_prefix.
2014-11-22 16:57:08 +01:00
Laurent Destailleur
d8767bfbae
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/product/class/product.class.php
2014-11-22 16:10:14 +01:00
Laurent Destailleur
9aab62ab36
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-11-22 16:03:09 +01:00
Laurent Destailleur
2f4de2ef75
Merge pull request #2016 from altatof/3.5
...
FIX: copy extrafields when creating order from propale and creating
2014-11-22 16:02:13 +01:00
Laurent Destailleur
d462facf6d
Fixed: [ bug #1653 ] Can't access task notes
2014-11-20 14:44:49 +01:00
Juanjo Menent
9e28452379
Fix: remove duplicate code
2014-11-19 10:02:01 +01:00
Juanjo Menent
3dacdf4e4a
Fix: Conflicts and remove duplicate code
2014-11-19 09:41:21 +01:00
Christophe Battarel
d0dc792b3c
check extrafields before inserting in DB
2014-11-17 11:17:45 +01:00
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
