Raphaël Doursenaud
67ddb6c94e
[Qual] Cleanup of inherited class properties
2015-09-24 20:12:55 +02:00
Laurent Destailleur
e62bb4da13
Make parameter required
2015-09-23 00:09:32 +02:00
Laurent Destailleur
5bc74ad6ea
Fix SQL injections #3300
2015-09-12 11:23:44 +02:00
Laurent Destailleur
77ef046af4
Start to mutualize the builddoc and remove_file action.
2015-09-06 14:02:21 +02:00
Laurent Destailleur
15ab9c0ecd
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/product/stock/mouvement.php
2015-08-20 16:08:42 +02:00
Laurent Destailleur
da8e71b2c5
Fix #3309
2015-08-20 16:05:29 +02:00
Laurent Destailleur
fc8a822f1d
Merge remote-tracking branch 'origin/3.7' into develop
2015-08-13 04:03:23 +02:00
Marcos García de La Fuente
2f6587b48e
FIX [ bug #3211 ] Error about sold to pay (Montant encours)
...
Close #3211
2015-08-09 18:08:22 +02:00
aspangaro
d9dd9ff688
Merge remote-tracking branch 'Upstream/3.8' into 3.8-1
2015-07-16 12:25:37 +02:00
aspangaro
59e88590e0
Move my address email to new one
2015-07-15 20:30:33 +02:00
Regis Houssin
394f8fbf91
Fix: for avoid mysql error with canvas
2015-07-14 17:18:41 +02:00
Laurent Destailleur
324d855b9c
Still working on project module to uniformize way of working with other
...
modules
2015-07-04 18:20:17 +02:00
Laurent Destailleur
230fd7a7e4
Debug withdraw module
2015-06-21 17:05:49 +02:00
Laurent Destailleur
fb1a3f3ea3
Rename alternative name
2015-06-16 12:04:11 +02:00
Marcos García de La Fuente
a496606826
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/soc.php
2015-06-13 02:45:42 +02:00
Laurent Destailleur
4a18b730b5
Fix: Avoid warning in expense report validation
...
Fix: navigation in expense report
2015-06-08 13:49:09 +02:00
Laurent Destailleur
101a9a4cf3
Fix: object user must not be overwritten
2015-06-07 19:35:47 +02:00
Laurent Destailleur
37cadaf4bf
Fix the trigger on delete thirdparty was not called
2015-06-07 03:41:12 +02:00
Laurent Destailleur
df60754e52
Merge pull request #2708 from GPCsolutions/deprecated
...
Deprecated
2015-06-05 15:44:08 +02:00
Laurent Destailleur
331ebbdd73
Fix behaviour on grey/visible menu must be same everywhere on
...
application.
2015-06-04 11:42:24 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Marcos García de La Fuente
460a2ec2ab
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/categories/categorie.php
htdocs/comm/prospect/list.php
2015-05-25 15:09:46 +02:00
Raphaël Doursenaud
ee808cdfd7
Added types constants to categories
2015-05-23 18:52:31 +02:00
Marcos García de La Fuente
e2b2c1c8bd
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/class/societe.class.php
2015-05-15 12:30:03 +02:00
Laurent Destailleur
cb6f23d9b6
Merge pull request #2771 from aternatik/api_rest
...
Add new core module : REST API
2015-05-12 19:39:37 +02:00
Marcos García de La Fuente
ce7ed70d74
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/prospect/list.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
2015-05-10 12:23:07 +02:00
Laurent Destailleur
3a8cf17f3c
NEW Can edit list of prospect status for customers/prospects. Add a new
...
entry into dictionary table to manage list fo status.
Removed deprecated files.
2015-05-06 23:13:07 +02:00
jfefe
53f480708f
Merge branch 'develop' into api_restler
2015-05-03 23:43:13 +02:00
jfefe
0d14cb8709
Modify thirdparty delete() method to pass user object as an argument.
2015-05-03 18:44:42 +02:00
jfefe
1536cd430d
Missing PHPDOC for REST API working for thirdparties
...
These tags are very important for REST API. Please have a look at https://github.com/Luracast/Restler/blob/master/ANNOTATIONS.md
2015-05-01 16:16:31 +02:00
Laurent Destailleur
100fa1067e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/bank/virement.php
htdocs/compta/facture/impayees.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/modProjet.class.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/langs/en_GB/admin.lang
htdocs/langs/es_AR/orders.lang
htdocs/langs/es_AR/trips.lang
htdocs/langs/es_CO/admin.lang
htdocs/langs/es_CO/orders.lang
htdocs/langs/es_CO/trips.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/pl_PL/interventions.lang
htdocs/langs/pt_BR/trips.lang
htdocs/langs/ro_RO/productbatch.lang
htdocs/langs/ro_RO/trips.lang
htdocs/main.inc.php
htdocs/projet/element.php
2015-04-22 17:57:57 +02:00
Laurent Destailleur
b7ffdba55f
Merge remote-tracking branch 'origin/3.6' into 3.7
2015-04-19 01:00:48 +02:00
Marcos García de La Fuente
15b1f03a08
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/list.php
htdocs/comm/prospect/list.php
htdocs/societe/consumption.php
htdocs/societe/soc.php
2015-04-19 00:48:07 +02:00
Maxime Kohlhaas
5a66e1f98a
Fix : include facture class for outstanding bill
2015-04-19 00:26:05 +02:00
Laurent Destailleur
5b29c87933
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/deplacement/fiche.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/expedition/fiche.php
2015-04-19 00:23:46 +02:00
Marcos García de La Fuente
e2e6049c7f
Copyright
2015-04-18 20:50:03 +02:00
Marcos García de La Fuente
dc790ff586
NEW: Feature request: A page to merge two thirdparties into one #2613
2015-04-18 20:41:09 +02:00
Maxime Kohlhaas
8b307aac56
Fix : customer outstanding was not calculated properly
2015-04-18 18:06:27 +02:00
Laurent Destailleur
56a14da5d4
FIXME that are not bug are replaced with TODO
...
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
2015-04-12 04:01:28 +02:00
Laurent Destailleur
1efa5bcabd
Fix: Avoid duplicate tooltip
2015-04-08 12:44:11 +02:00
Scrutinizer Auto-Fixer
4da737424e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-04-06 10:25:30 +00:00
Marcos García de La Fuente
8b8171c700
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/card.php
2015-03-30 03:25:57 +02:00
Marcos García de La Fuente
cc1d298f29
Merge branch 'develop' into constants
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture/class/facture.class.php
2015-03-30 02:36:46 +02:00
Frédéric FRANCE
375e0b7e2a
PhotoInTooltip for getNomUrl company
2015-03-27 08:32:51 +01:00
Marcos García de La Fuente
b822a1e3ad
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/class/societe.class.php
2015-03-15 18:20:17 +01:00
aspangaro
d69f066735
QUAL: Traduce terms + remove <center>
2015-03-15 14:04:07 +01:00
Marcos García de La Fuente
094538c07b
Implemented constants in Commande, Facture and Propal
2015-03-15 11:48:57 +01:00
Laurent Destailleur
a5645b626c
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
htdocs/projet/element.php
2015-03-11 03:55:46 +01:00
Laurent Destailleur
154865f545
Fix return error when it is not
2015-03-10 16:37:39 +01:00
Laurent Destailleur
0df2b4cc26
Fix check parameters
2015-03-10 16:14:46 +01:00
