arnaud
|
f79b72f724
|
FIX edit sociale was emptying label
|
2017-06-29 16:57:30 +02:00 |
|
Laurent Destailleur
|
b81de35703
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/sociales/class/chargesociales.class.php
htdocs/contrat/class/contrat.class.php
|
2017-05-12 15:44:09 +02:00 |
|
Laurent Destailleur
|
419c15ee8e
|
Fix escaping class
|
2017-05-12 15:28:10 +02:00 |
|
Laurent Destailleur
|
3e0fcf5ec2
|
Fix label "total for this page" on last page.
|
2017-05-10 11:57:59 +02:00 |
|
Laurent Destailleur
|
6f3677a322
|
FIX total payed wrong
|
2017-01-18 13:28:02 +01:00 |
|
Laurent Destailleur
|
6e00d7fee3
|
Fix date modification not visible
|
2016-12-27 01:41:04 +01:00 |
|
Laurent Destailleur
|
3e28f22bad
|
Fix style
|
2016-12-27 00:08:43 +01:00 |
|
aspangaro
|
c187f95269
|
Social contribution : Complete work on dol_banner
|
2016-12-20 21:59:05 +01:00 |
|
aspangaro
|
542499d94e
|
Fix Social contribution - Missing information in tab information
|
2016-12-10 15:47:44 +01:00 |
|
aspangaro
|
bc189c0f6a
|
Responsive
|
2016-12-10 15:13:24 +01:00 |
|
aspangaro
|
953feefb6a
|
Social contribution in adaptive mode (Payment are under the information)
|
2016-11-29 06:43:16 +01:00 |
|
aspangaro
|
d73c24bb45
|
Social contribution in adaptive mode (Payment are under the information)
|
2016-11-29 06:34:20 +01:00 |
|
Laurent Destailleur
|
83972b39ce
|
Complete work on dol_banner. Fix errors due to missing columns.
|
2016-11-28 23:58:36 +01:00 |
|
aspangaro
|
fc0edc3499
|
Uniformize presentation of social contribution - Add button cancel in create mode
|
2016-11-28 21:27:02 +01:00 |
|
Laurent Destailleur
|
2c9edd4205
|
Maxi debug on list. Fix responsive design.
|
2016-11-27 13:49:46 +01:00 |
|
Laurent Destailleur
|
0f016bbbcb
|
Uniformise look and feel
|
2016-11-03 20:57:19 +01:00 |
|
Laurent Destailleur
|
6ceb79cf5a
|
Uniformise look and feel
|
2016-11-03 20:55:55 +01:00 |
|
Laurent Destailleur
|
220d81b350
|
Fix duplicate tooltips
|
2016-10-28 17:43:29 +02:00 |
|
Laurent Destailleur
|
e22e243bc5
|
NEW Can set to paid automaically social or fiscal contributions after a
payment was recorded.
|
2016-08-22 14:31:15 +02:00 |
|
Laurent Destailleur
|
03c30c487c
|
Uniformise code
|
2016-08-22 13:46:38 +02:00 |
|
aspangaro
|
b7420372b7
|
Uniformize presentation, add button cancel everywhere
|
2016-08-12 22:53:30 +02:00 |
|
frederic34
|
e71833c0d9
|
typo
|
2016-06-19 20:24:20 +02:00 |
|
frederic34
|
77071ca515
|
select bank and payment mode for social contrib
|
2016-06-19 18:53:19 +02:00 |
|
Laurent Destailleur
|
44503cb43c
|
Fix missing "back to list" link
|
2016-06-14 20:49:34 +02:00 |
|
Laurent Destailleur
|
6034ba658c
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
|
2016-06-10 18:59:05 +02:00 |
|
Laurent Destailleur
|
fd4973c413
|
Fix missing total
|
2016-06-09 07:50:54 +02:00 |
|
Laurent Destailleur
|
5db6bcd4a8
|
Fix contextpage lost on submitting form or sorting
|
2016-06-07 14:06:00 +02:00 |
|
Laurent Destailleur
|
a5d7c303e7
|
FIX Button must be out of tabs
|
2016-06-02 21:11:14 +02:00 |
|
Laurent Destailleur
|
7519c4a602
|
FIX Log of tax
FIX Missing import key on social contributions and missing class to
manage type of social contributions.
|
2016-06-01 13:24:27 +02:00 |
|
Laurent Destailleur
|
25b7f0ab62
|
FIX Remove a total that has no sense
|
2016-04-22 17:11:12 +02:00 |
|
Laurent Destailleur
|
e1bec46a34
|
FIX The include file for action on files should not be a template file
but an action include file.
|
2016-04-02 14:16:16 +02:00 |
|
Laurent Destailleur
|
91caea5707
|
Code was corrupted with very bad commits. I restore files manually.
|
2016-03-25 15:53:44 +01:00 |
|
Marcos García de La Fuente
|
89bd173c2f
|
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
|
2016-03-21 21:51:29 +01:00 |
|
Marcos García de La Fuente
|
5a046125db
|
Missing changes from previous commits
|
2016-03-20 14:24:49 +01:00 |
|
Laurent Destailleur
|
9796b1b268
|
Can select number of records into lists
|
2016-02-16 17:43:05 +01:00 |
|
Laurent Destailleur
|
9da0164d90
|
Uniformize code for lists
|
2016-02-07 15:50:48 +01:00 |
|
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 |
|