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
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
jfefe
04161084cf
Fix : missing method to delete linked resource
2014-05-11 12:26:57 +02:00
jfefe
225c7ae07b
New : link resource with any element
...
With tpl system, external modules can declare resource with hook getElementResources
2014-05-10 22:07:54 +02:00
Jean-François Ferry
fdb50ab116
Move generic function from commonobject.class to functions2.lib.php (work on resource module)
2014-05-10 22:06:22 +02:00
Jean-François Ferry
bb58bed930
In commonoobject add method for adding resource to an element
2014-05-10 22:03:05 +02:00
Jean-François Ferry
71c44d82ab
Move resource module functions into commonobject :
...
- new method to get an array with object properties
- new method to fetch an object only with id and element_type
2014-05-10 22:03:05 +02:00
Laurent Destailleur
d224128c46
New: Merge free product and predefined product area to enter new
...
product.
2014-05-05 14:30:08 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
e1d30837e9
Try to remove a warning
2014-05-03 03:10:58 +02:00
Laurent Destailleur
d97c45a9b8
Add version of phpunit into travis script.
...
Fix: strict mode.
2014-05-01 19:17:45 +02:00
Laurent Destailleur
4cb671f4db
Qual: Clean deprecated code.
2014-04-28 11:55:08 +02:00
Laurent Destailleur
97fce71218
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/install/mysql/migration/repair.sql
htdocs/langs/en_US/errors.lang
htdocs/product/fiche.php
htdocs/projet/tasks/task.php
2014-04-26 22:35:35 +02:00
Laurent Destailleur
6968304641
Fix: [ bug #1352 ] Removing a shipping does not remove the delivery.
2014-04-26 17:27:59 +02:00
Raphaël Doursenaud
9960e5aa8f
Qual: Removed unused variable
2014-04-23 18:24:05 +02:00
Raphaël Doursenaud
d57b4192b6
Qual: Wrong variable name
2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
670e861d7b
Qual: Missing global declaration
2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
6cfcdbfe56
Qual: Wrong type in method documentation
2014-04-23 18:23:55 +02:00
Raphaël Doursenaud
84c9a390eb
Qual: Mistyped class property
2014-04-23 18:23:55 +02:00
Laurent Destailleur
13929bc46f
New: showrefnav can be used with tables without prefix.
2014-04-09 13:19:31 +02:00
philippe
e2b29bb108
fix english misspelling
2014-03-05 09:57:36 +01:00
Laurent Destailleur
5780f14a65
Qual: Removed TODO and add test to report bug.
2014-02-17 18:27:45 +01:00
Laurent Destailleur
867c83680b
Merge remote-tracking branch 'origin/3.5' into develop
2014-02-17 18:22:49 +01:00
Laurent Destailleur
342ee2e6f6
Qual: Add a TODO to warn to remove this bug.
2014-02-17 18:22:15 +01:00
Laurent Destailleur
860ca15cfc
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2014-02-17 15:27:30 +01:00
Laurent Destailleur
abc96b51fa
Enable extrafields for customer order, proposal and invoice lines. This
...
feature was developed for 3.5 but was disabled (hidden) because of
a bug not possible to fix enough quickly for 3.5.0 release.
2014-02-16 23:51:29 +01:00
Laurent Destailleur
634c5b64f1
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/product/fiche.php
2014-02-12 00:25:08 +01:00
Laurent Destailleur
266b413139
Fix: colspan for extrafields
2014-02-12 00:23:15 +01:00
BENKE Charles
b86322c14a
Update commonobject.class.php
...
hook module need extrafields parameter too
2014-02-01 12:55:05 +01:00
Laurent Destailleur
101151630d
Fix: doxygen errors
2014-01-24 10:38:45 +01:00
Christophe Battarel
687fc1798b
on clone of propal, copy contact informations
2014-01-16 11:43:59 +01:00
Laurent Destailleur
6c3c66c45d
New: Add menu entry to barcode genration page.
2014-01-04 12:29:20 +01:00
Laurent Destailleur
2f5932026e
More information returned into return code
2013-12-13 18:33:05 +01:00
Raphaël Doursenaud
fa43476890
Fixed methods description
...
These methods were declared void but actually returns values. Added proper documentation.
2013-11-07 21:02:50 +01:00
Laurent Destailleur
b18e125143
Merge pull request #1279 from aspangaro/skype
...
Task 157 : add a Skype button
2013-11-05 05:33:33 -08:00
Laurent Destailleur
190dabc3f7
Fix: Tons of bugs with extrafields feature.
2013-11-05 13:11:36 +01:00
aspangaro
8fd021bf36
Merge branch 'upstream/develop'
2013-11-04 21:44:58 +01:00
aspangaro
d79ba9695a
Task 157 : Add a skype button
2013-11-04 21:41:36 +01:00
Laurent Destailleur
c815bd96fb
Doxygen
2013-11-04 16:50:41 +01:00
Laurent Destailleur
469dd03673
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/filefunc.inc.php
htdocs/langs/nl_NL/margins.lang
2013-11-01 17:58:38 +01:00
Christophe Battarel
ba0273ccc4
fix bad rounding on margin calculation and display
2013-10-30 18:17:37 +01:00
Regis Houssin
bc0f65b73c
Fix: reorder lines problem
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
2013-10-12 11:58:38 +02:00
Regis Houssin
8801d7a1eb
Fix: reorder lines problem
2013-10-12 11:54:37 +02:00
Christophe Battarel
02278a399c
better margin calculation (especially for credit notes)
2013-10-05 10:29:22 +02:00
Laurent Destailleur
ca24b45aa9
Merge pull request #1101 from PaulPoulain/940-develop
...
940 develop
2013-09-26 05:00:57 -07:00
Laurent Destailleur
c88072433c
Merge pull request #1244 from defrance69/patch-12
...
Update commonobject.class.php
2013-09-25 08:18:49 -07:00
BENKE Charles
1c988fc559
Update commonobject.class.php
2013-09-25 11:14:50 +02:00
BENKE Charles
b400803a2a
Update commonobject.class.php
...
add complementary param
2013-09-25 10:15:32 +02:00
Christophe Battarel
b197231c04
fix bad margin calculation for credit notes
2013-09-24 17:49:56 +02:00
BENKE Charles
d978d64d59
Update commonobject.class.php
...
just the active type of contact
2013-09-24 14:19:52 +02:00
Laurent Destailleur
3d62303d59
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
build/debian/get-orig-source.sh
build/debian/watch
htdocs/fourn/ajax/getSupplierPrices.php
2013-09-19 01:02:53 +02:00
Laurent Destailleur
8526d34d3b
Fix: Calculation of second rounding method is available for supplier
...
invoices.
2013-09-18 16:46:54 +02:00
Christophe Battarel
775d259f88
Fix: Supplier price displayed on document lines and margin infos didnt take discount
2013-09-15 14:52:41 +02:00
Laurent Destailleur
f2bdd8c1d8
Work on alternative vat calculation mode
2013-09-13 17:43:26 +02:00
Laurent Destailleur
72557437ef
Checkstyle
2013-09-10 14:19:36 +02:00
Laurent Destailleur
10c2bdc193
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/boxes/box_ficheinter.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/langs/fr_FR/compta.lang
2013-09-04 15:13:38 +02:00
Laurent Destailleur
ee0f44c9e3
Fix: Try a fix of cloning lines->array
2013-09-04 10:45:15 +02:00
lalaina rasamoelina
ca6a973d96
T940-develop: creating a bouton which permit to create an event in the propal,and command .
...
If we create an event in the propal, then the events will be attached in the propal
and if it's for command,it will be attached in the command
2013-08-27 15:51:06 +02:00
Laurent Destailleur
6d2c27beec
Fix: header already sent
2013-08-24 22:09:32 +02:00
simnandez
913888824f
Remove duplicate $user
2013-08-20 12:26:39 +02:00
Christophe Battarel
4c7741f5f0
manage user permissions for margin display
2013-08-20 12:11:19 +02:00
Christophe Battarel
220f9b7e9f
define global user variables so templates can manage user permissions
2013-08-20 12:01:52 +02:00
simnandez
3577025f0e
Fix update extrafield do not display immediatly
2013-08-14 09:56:08 +02:00
Florian Henry
26d1352de4
Fix update extrafield do not display immediatly
2013-08-12 14:30:42 +02:00
Florian Henry
75701ee995
Fix: Supplier invoice and supplier order are not displayed into object
...
link into agenda event card
2013-08-09 13:11:18 +02:00
Laurent Destailleur
0f86755033
Fix: Found a dozen of bugs into sub module delivery of module shipment.
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/expedition/class/expedition.class.php
htdocs/expedition/fiche.php
2013-08-07 15:29:13 +02:00
Laurent Destailleur
d5a57f3717
Fix: Found a dozen of bugs into sub module delivery of module shipment.
2013-08-07 15:08:30 +02:00
Maxime Kohlhaas
dae36229a4
Task # 1011 : add payment terms and payment mode on supplier card
2013-07-30 15:06:57 +02:00
Laurent Destailleur
67820774bb
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/commande/fiche.php
htdocs/core/class/extrafields.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-07-27 14:21:47 +02:00
jfefe
95bc40d0df
Missing attribute to indicate required fields
2013-07-26 08:51:22 +02:00
Laurent Destailleur
3896cde299
Removed useless method. Prefer using generic method.
2013-07-19 13:38:57 +02:00
Maxime Kohlhaas
63e6cf5c81
Add possibility to define dependencies between extra lists
2013-07-18 17:42:09 +02:00
Laurent Destailleur
7c163f7be3
Fix: Running fixdosfile onto all project
2013-07-07 13:17:48 +02:00
Laurent Destailleur
2bc650bf61
Qual: Remove tons of codesniffer errors and warnings.
2013-07-07 13:14:32 +02:00
Laurent Destailleur
eef039e02f
New: [ task #286 ] Enhance rounding function of prices to allow round of
...
sum instead of sum of rounding
2013-07-04 00:11:40 +02:00
Laurent Destailleur
c276283d9f
New: Add errorsToString function
2013-06-28 12:44:17 +02:00
Laurent Destailleur
c92aa1f6aa
New: dol_strintotime accept format YYYY-MM-DD HH:MM:SS
...
Fix: create member was missing field import_key
New: Uniformize code
2013-06-27 17:45:58 +02:00
Regis Houssin
05bd035488
Fix: convert line delimiters
2013-06-24 17:34:22 +02:00
Laurent Destailleur
09317e2034
Fix: Pb with firstname/lastname and font size
2013-06-19 18:12:05 +02:00
Laurent Destailleur
0b53f72779
Fix: Pb with firstname/lastname and font size
2013-06-19 18:08:05 +02:00
Laurent Destailleur
9012c49299
Perf: Optimize class loading. Need 1 MB less of memory to load home
...
page.
2013-06-16 23:15:20 +02:00
Laurent Destailleur
c748f3d834
Qual: Removed useless methods
...
Qual: Removed deprecated vars
Qual: Free memory
2013-06-16 21:31:21 +02:00
Florian Henry
9f03074127
- New: [ task #926 ] Add extrafield feature on order lines
...
- New: [ task #927 ] Add extrafield feature on Proposal lines
- New: [ task #928 ] Add extrafield feature on invoice lines
2013-06-10 16:05:41 +02:00
Regis Houssin
c9a71439b2
Fix: EOF
2013-06-05 16:24:32 +02:00
Laurent Destailleur
c6c4a83850
Fix: Removed deprecated code fo local tax type 7 since we can use now
...
the fiscal stamp that is a better implementation.
2013-06-04 12:04:04 +02:00
Laurent Destailleur
1cb33c43bd
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/comm/action/listactions.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/agenda.lib.php
htdocs/product/liste.php
2013-05-29 01:30:36 +02:00
Florian Henry
56556ba222
Fix [ bug #911 ] Reorder intervention do not work
2013-05-26 10:15:43 +02:00
Laurent Destailleur
71e14df62f
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
2013-05-20 17:37:08 +02:00