aspangaro
048b3c01ce
Add salary payment in tax module - Link to user.
...
Necessary for future hrm module.
2014-03-06 21:21:16 +01:00
Laurent Destailleur
dd3169e1ed
Sync from transifex
2014-03-05 20:47:22 +01:00
Laurent Destailleur
6c536d43e5
Can also sort on username. Uniformize code of index page.
2014-03-05 11:37:32 +01:00
Laurent Destailleur
cdd2815d45
Merge pull request #1449 from KreizIT/dluo_step2
...
Dluo step2
2014-03-05 00:08:58 +01:00
KreizIT
7f275dfbf4
- Add table modification for product (forget in step 1)
...
- Add module for batch number management
- change dependency for stock and product
- change product class and fiche showing new select for batch managment on product
2014-03-04 18:55:55 +01:00
Laurent Destailleur
24b0ea6613
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.commande.class.php
2014-03-03 19:38:02 +01:00
Laurent Destailleur
a084887442
Merge branch 'project-translations' of
...
https://github.com/marcosgdf/dolibarr into
marcosgdf-project-translations
Conflicts:
ChangeLog
2014-03-01 13:38:50 +01:00
Laurent Destailleur
480b09f192
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/societe/class/societe.class.php
2014-02-26 15:49:29 +01:00
Laurent Destailleur
3f05651b94
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-02-25 16:14:51 +01:00
Laurent Destailleur
63a2aa3365
Fix: sql error with postgres when creating extrafield with an upper cas
...
character. code for new fields must be always lowercase.
2014-02-25 15:48:13 +01:00
Laurent Destailleur
7241714551
Merge pull request #1435 from marcosgdf/export-translations
...
Corrected export translations
2014-02-25 14:11:40 +01:00
Marcos García de La Fuente
4157452c6d
Translated export filters
2014-02-25 03:23:08 +01:00
Marcos García de La Fuente
968b5771db
Corrected project contact types translation
2014-02-25 02:42:10 +01:00
Florian Henry
46ae5d6e9c
- New: Price management enhancement (multiprice level, price by
...
customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
- Fix: Project Task numbering rule customs rule works
2014-02-23 16:16:47 +01:00
simnandez
c2db656c86
Fix: Action event SHIPPING_VALIDATE is not implemented
2014-02-19 17:33:22 +01:00
simnandez
7511f626b3
Fix: Action event SHIPPING_VALIDATE is not implemented
2014-02-19 17:32:20 +01:00
Laurent Destailleur
5a29b3d546
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/societe/soc.php
2014-02-19 15:37:48 +01:00
Laurent Destailleur
4915ec8916
Fix: Bad space in predefined messages.
...
Fix: Signature was not added for email sent from thirdparty page.
2014-02-19 15:33:04 +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
fa7e7c75bf
Fix: Add a protection if user has no option to edit stock
2014-02-17 11:48:57 +01:00
Laurent Destailleur
492dec0854
Sync from transifex
2014-02-11 23:19:22 +01:00
Laurent Destailleur
46e9b5d550
Merge branch 'develop' of https://github.com/grandoc/dolibarr into
...
grandoc-develop
Conflicts:
htdocs/langs/ar_SA/admin.lang
htdocs/langs/el_GR/admin.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/tr_TR/admin.lang
2014-02-10 01:30:48 +01:00
Laurent Destailleur
ce8d13ead0
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/makepack-dolibarr.pl
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/comm/action/fiche.php
htdocs/filefunc.inc.php
htdocs/install/check.php
2014-02-10 00:38:10 +01:00
Laurent Destailleur
fdfb7f1a8a
Fix: Be sure there is no duplicate default rib.
2014-02-08 03:24:48 +01:00
Laurent Destailleur
e22e4fc4d7
Sync from transifex
2014-02-05 23:10:44 +01:00
Grand Philippe
1855ba556a
fix misspelled words
2014-02-05 17:53:30 +01:00
Laurent Destailleur
9cf745b127
Sync with transifex
2014-01-26 23:12:25 +01:00
Maxime Kohlhaas
db90776400
Thousand separator has been set to None instead of space
2014-01-23 12:16:38 +01:00
Maxime Kohlhaas
eb7d802a8f
Thousand separator has been set to None instead of space
2014-01-23 09:07:15 +01:00
Laurent Destailleur
23e6709164
Better error message
2014-01-21 12:55:05 +01:00
Laurent Destailleur
e85cf332b3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-01-20 17:34:40 +01:00
Laurent Destailleur
062230050f
New: Can call back barcode number from a product ref or thirdparty ref.
2014-01-20 17:18:56 +01:00
Laurent Destailleur
8d8e016115
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-20 02:42:37 +01:00
Laurent Destailleur
0d18892506
Merge from 3.4
2014-01-20 02:21:30 +01:00
Laurent Destailleur
b5620d5f15
New: The box "balance of bank accounts" show all opened accounts.
2014-01-15 17:52:16 +01:00
Laurent Destailleur
06aa3b8250
Merge branch 'opensurvey-improvements' of
...
https://github.com/marcosgdf/dolibarr into
marcosgdf-opensurvey-improvements
Conflicts:
ChangeLog
2014-01-12 14:50:00 +01:00
Marcos García de La Fuente
4f57e82975
Removed odd messages
2014-01-05 09:36:35 +01:00
Marcos García de La Fuente
fba3c63050
Starting to make survey creation a user-only access page
2014-01-05 07:28:04 +01:00
Marcos García de La Fuente
dd8d8e8e42
Removed unused translation strings
2014-01-05 04:59:15 +01:00
Laurent Destailleur
ee1e7471ff
Fix: A lot of bug into generation of sticker pages or address pages
...
form members module:
- Position of element was wrong for non A4 pages.
- Removed bugged definition of 5164 sticker template.
- Solve problem of image proportions.
- Margin of right was wrong.
Conflicts:
htdocs/core/modules/member/doc/pdf_standard.class.php
htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
2014-01-04 16:17:47 +01:00
Laurent Destailleur
918c5ff405
Fix: A lot of bug into generation of sticker pages or address pages
...
form members module:
- Position of element was wrong for non A4 pages.
- Removed bugged definition of 5164 sticker template.
- Solve problem of image proportions.
- Margin of right was wrong.
2014-01-04 16:13:34 +01:00
Laurent Destailleur
eadccb5d9b
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/langs/bg_BG/main.lang
htdocs/langs/el_GR/cron.lang
htdocs/langs/el_GR/help.lang
htdocs/langs/el_GR/main.lang
htdocs/langs/el_GR/margins.lang
htdocs/langs/el_GR/stocks.lang
htdocs/langs/el_GR/suppliers.lang
htdocs/langs/et_EE/admin.lang
htdocs/langs/et_EE/agenda.lang
htdocs/langs/et_EE/banks.lang
htdocs/langs/et_EE/bills.lang
htdocs/langs/et_EE/commercial.lang
htdocs/langs/et_EE/companies.lang
htdocs/langs/et_EE/compta.lang
htdocs/langs/et_EE/dict.lang
htdocs/langs/et_EE/help.lang
htdocs/langs/et_EE/main.lang
htdocs/langs/et_EE/margins.lang
htdocs/langs/et_EE/other.lang
htdocs/langs/et_EE/stocks.lang
htdocs/langs/et_EE/suppliers.lang
htdocs/langs/et_EE/users.lang
htdocs/langs/et_EE/withdrawals.lang
htdocs/langs/lv_LV/admin.lang
htdocs/langs/lv_LV/agenda.lang
htdocs/langs/lv_LV/banks.lang
htdocs/langs/lv_LV/bills.lang
htdocs/langs/lv_LV/boxes.lang
htdocs/langs/lv_LV/opensurvey.lang
htdocs/langs/lv_LV/users.lang
htdocs/langs/ro_RO/admin.lang
htdocs/langs/ro_RO/banks.lang
htdocs/langs/ro_RO/bills.lang
htdocs/langs/ro_RO/companies.lang
htdocs/langs/ro_RO/compta.lang
htdocs/langs/ro_RO/cron.lang
htdocs/langs/ro_RO/dict.lang
htdocs/langs/ro_RO/help.lang
htdocs/langs/ro_RO/main.lang
htdocs/langs/ro_RO/margins.lang
htdocs/langs/ro_RO/other.lang
htdocs/langs/ro_RO/stocks.lang
htdocs/langs/ro_RO/suppliers.lang
htdocs/langs/ro_RO/withdrawals.lang
htdocs/langs/uz_UZ/main.lang
2013-12-31 12:18:31 +01:00
Laurent Destailleur
f44a45feb2
Fix: Missing some languages into the transifex sync script.
...
Trans: Sync language files from transifex.
2013-12-31 12:03:37 +01:00
Laurent Destailleur
f0151ce112
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-30 12:44:46 +01:00
Laurent Destailleur
cfb791c584
Fix: Better translation
2013-12-29 19:30:11 +01:00
Laurent Destailleur
8248f63826
Fix: Missing translation
2013-12-27 20:31:57 +01:00
Laurent Destailleur
8207b7c243
Missing translation
2013-12-27 20:27:17 +01:00
Laurent Destailleur
7d6779bd4a
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-27 18:09:31 +01:00
Laurent Destailleur
da2f35e1a2
Fix: Missing translation.
...
Fix: Title of tab not visible
2013-12-27 17:43:52 +01:00
Laurent Destailleur
3bb4de3e86
Better translation
2013-12-27 15:56:00 +01:00
