Laurent Destailleur
ed3f0ce86b
Fix totalnboflines not correctly managed
2015-12-28 00:20:48 +01:00
Laurent Destailleur
db7a98f0ef
Fix: When a payment mode was disabled, it was not visible on old
...
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
philippe grand
30eb08151d
[Qual] Close database handler should be after Footer
2015-12-11 14:19:38 +01:00
philippe grand
f308606ee1
[Qual] Uniformize code
2015-11-15 07:47:35 +01:00
Laurent Destailleur
81580f75b9
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture.php
2015-10-18 21:22:42 +02:00
Laurent Destailleur
afe4057a97
FIX #3757 Can't set amount in a social contribution with some languages
2015-10-18 21:17:19 +02:00
philippe grand
f31ddc23aa
[Qual] Uniformize code
2015-10-17 16:18:33 +02:00
Laurent Destailleur
62792c08eb
Merge pull request #3591 from GPCsolutions/inherited
...
[Qual] Cleanup of inherited class properties
2015-09-26 11:23:59 +02:00
Raphaël Doursenaud
67ddb6c94e
[Qual] Cleanup of inherited class properties
2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
631ee83745
[Qual] Replaced deprecated print_fiche_titre()
2015-09-24 18:34:58 +02:00
Laurent Destailleur
cb98d6cb93
Merge remote-tracking branch 'origin/3.8' into develop
2015-07-19 15:32:20 +02:00
Laurent Destailleur
2f2b0df6f8
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contact/exportimport.php
htdocs/contact/info.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/core/modules/modSociete.class.php
htdocs/core/tpl/document_actions_pre_headers.tpl.php
htdocs/langs/fr_FR/categories.lang
htdocs/main.inc.php
htdocs/product/reassort.php
htdocs/projet/list.php
htdocs/societe/info.php
2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/compta/sociales/class/paymentsocialcontribution.class.php
htdocs/contact/exportimport.php
htdocs/contact/ldap.php
htdocs/contact/perso.php
htdocs/contact/vcard.php
htdocs/core/class/commonobject.class.php
htdocs/product/reassort.php
htdocs/projet/liste.php
htdocs/societe/consumption.php
htdocs/societe/info.php
2015-07-19 12:04:30 +02:00
aspangaro
26ae9a6eb7
Fix: Donation payment type don't show in card
2015-07-15 19:54:51 +02:00
Maxime Kohlhaas
5d14d05ce1
Fix : Social contribution payment deletion was not deleting the bank line
2015-07-03 16:38:54 +02:00
Laurent Destailleur
c69a9996f1
Uniformize code
2015-06-30 15:12:15 +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
Laurent Destailleur
01aad8516d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/adherents/list.php
htdocs/compta/dons/card.php
htdocs/compta/dons/class/don.class.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/security.lib.php
htdocs/main.inc.php
htdocs/product/stock/massstockmove.php
htdocs/public/test/test_arrays.php
htdocs/public/test/test_forms.php
htdocs/societe/societe.php
2015-05-31 03:30:38 +02:00
Laurent Destailleur
11d4a945b0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/adherents/liste.php
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/contact/list.php
htdocs/contrat/liste.php
htdocs/product/liste.php
2015-05-25 18:08:23 +02:00
Alexis Algoud
81a919e8a3
round to price2num
2015-05-22 09:05:38 +02:00
Alexis Algoud
9184b08f94
FIX button create payment hide if tax amount is less than 1
2015-05-21 16:51:21 +02:00
Laurent Destailleur
43b5209192
NEW Clean code into salary module, debug and add indexes
...
NEW Can filter on user list and salary payments on user with naural
search.
2015-05-13 08:57:39 +02:00
Laurent Destailleur
65dafeee55
Uniformize feature between invoice and merging tool
2015-04-19 23:15:24 +02:00
Laurent Destailleur
6fa0234409
Uniformize code
2015-04-07 03:00:11 +02:00
aspangaro
d69f066735
QUAL: Traduce terms + remove <center>
2015-03-15 14:04:07 +01:00
Maxime Kohlhaas
6f9fb6a282
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2015-03-10 15:18:08 +01:00
Maxime Kohlhaas
f90df57dc5
New : disallow social contribution modification if paid
2015-03-10 14:49:36 +01:00
Maxime Kohlhaas
db4bbf46fc
New : allow to edit social contribution amount
2015-03-10 14:43:13 +01:00
Laurent Destailleur
daabc113a5
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
README.md
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
2015-02-26 13:36:07 +01:00
Laurent Destailleur
41a74c62e2
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:03:17 +01:00
Laurent Destailleur
e3713c8b6d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
Laurent Destailleur
179cbbd187
Maxi debug and enhancement of module batch.
2015-02-11 22:54:06 +01:00
Marcos García de La Fuente
0d6d98b395
PHPDoc and misc fixes for several folders
2015-02-10 13:17:37 +01:00
frederic34
f4161b457b
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3
Add tooltip in getNomUrl link
2015-01-20 21:40:33 +01:00
frederic34
60661ae948
Add some "classfortooltip"
2015-01-09 00:07:54 +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
Frédéric FRANCE
2a79c2c826
Update /compta/sociales/index.php
2014-11-23 17:44:25 +01:00
Laurent Destailleur
445f696d28
Fix: Pb of object with wrong type.
2014-11-15 18:24:38 +01:00
Laurent Destailleur
d98bfb1d8d
Fix: Bugs reported by scrutinizer
2014-11-15 15:19:37 +01:00
aspangaro
1dcb7a58f3
Presentation & fix SQL injection
2014-11-02 14:51:21 +01:00
aspangaro
6109529c6c
vat payments list & typo on css class
2014-11-02 14:19:28 +01:00
aspangaro
a0d3dbd93c
Social Contrib list
2014-11-01 14:52:05 +01:00
Laurent Destailleur
9768550696
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/categories/fiche.php
htdocs/comm/action/index.php
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fourn/fiche.php
htdocs/product/composition/fiche.php
htdocs/product/price.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
2014-10-12 02:54:34 +02:00
Laurent Destailleur
97eec37f1c
Uniformize code: property "nom" for thirdparty is aliased into "name"
...
everywhere.
2014-10-04 17:20:17 +02:00
Drosis Nikos
8c6ce79d9d
Fix Lang for Payment Type
2014-09-29 18:15:09 +03:00
Alexis Algoud
691658cde3
add the clone action for a social contribution
...
- With option to clone it to the next month by default
2014-09-23 16:52:15 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
Marcos García de La Fuente
4f4ac30fc0
Deprecating arbitrary use of dol_htmloutput* functions
2014-07-20 02:32:13 +02:00
Marcos García de La Fuente
434bb1bec7
Migrated old message notifications to the """new""" system
2014-07-20 00:10:40 +02:00
