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
Maxime Kohlhaas
5d14d05ce1
Fix : Social contribution payment deletion was not deleting the bank line
2015-07-03 16:38:54 +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
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
Marcos García de La Fuente
0d6d98b395
PHPDoc and misc fixes for several folders
2015-02-10 13:17:37 +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
Marcos García de La Fuente
ec661d0c6c
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +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
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
Laurent Destailleur
9f795331f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/charges.php
htdocs/core/db/mysql.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
2014-05-06 23:58:17 +02:00
Laurent Destailleur
5a6ad1ef5f
Fix: [ bug #1362 ] Note is not saved
...
Fix: tr/td balance.
2014-05-06 23:19:48 +02:00
Laurent Destailleur
5e12459ad1
Fix: Ref and date for social contributions payments were merged into on
...
field making not possible to click on ref.
2014-05-06 22:54:33 +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
aspangaro
c6e2afb11e
Social contrib. :: Replace index.php by $_SERVER["PHP_SELF"]
2014-05-01 05:57:27 +02:00
Laurent Destailleur
19d71ffb38
Prepare fix to hide images generated by "preview" feature.
2014-04-29 21:14:55 +02:00
Laurent Destailleur
c81406c7f3
Fix: CI
2014-03-31 02:41:15 +02:00
Laurent Destailleur
c45f509984
Qual: Uniformizing payments
2014-03-26 15:41:09 +01:00
Laurent Destailleur
59042a30e1
Fix and uniformize code for payment of salaries.
2014-03-25 21:35:52 +01:00
Marcos García de La Fuente
fa56fe4e8b
Corrected Unknown error message typo
2014-03-10 19:36:32 +01:00
Laurent Destailleur
b499efeccf
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/compta/sociales/index.php
htdocs/compta/tva/index.php
2014-02-12 22:29:56 +01:00
Laurent Destailleur
db006dcdf8
Fix: Missing lang->load
2014-02-05 12:52:00 +01:00
Laurent Destailleur
f8a68b0449
Fix: Missing translation
2014-02-04 20:57:22 +01:00
Grand Philippe
462f65614d
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1
2014-01-13 10:10:17 +01:00
Cédric Salvador
00c9df670c
renamed templates
2013-11-06 10:22:01 +01:00
Cédric Salvador
c96b2d3b87
factorized form attach, documents list and links list for the document pages
2013-11-06 10:19:16 +01:00
Cédric Salvador
23008c3b31
factorized document actions
...
Conflicts:
htdocs/societe/document.php
2013-11-06 10:11:40 +01:00
aspangaro
a9dd9d6dfc
Modify the presentation of the card
2013-11-03 15:07:26 +01:00
Grand Philippe
b599481ef6
standardize code
2013-06-20 09:18:12 +02:00
Laurent Destailleur
3a11e0baad
New: Script export-bank-receipts should be ready for test.
2013-05-14 23:59:59 +02:00
Laurent Destailleur
4e0ef01389
Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap
2013-04-25 01:13:13 +02:00
Regis Houssin
29a8c10504
Fix: broken features
2013-04-22 15:09:19 +02:00
Regis Houssin
5682e0ae25
Fix: missing quote
2013-04-15 21:40:49 +02:00
Regis Houssin
c9dba00f3f
Fix: missing current entity record
2013-04-15 21:29:49 +02:00
Laurent Destailleur
8d206fdfb0
Prepare move to other licence. For the moment all answers for licence
...
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
