Commit Graph

6274 Commits

Author SHA1 Message Date
philippe grand
44d71c2bb4 fix : missing translation 2016-03-08 09:08:31 +01:00
Laurent Destailleur
f06911a8b0 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/societe/commerciaux.php
2016-03-04 15:39:55 +01:00
philippe grand
6851c3fdb0 fix : missing translation 2016-03-03 16:18:07 +01:00
philippe grand
4a3509d350 fix : missing translation 2016-03-03 16:09:19 +01:00
philippe grand
74601a0b1d fix : missing translation 2016-03-03 16:01:50 +01:00
philippe grand
9e80a37947 fix : missing translation 2016-03-03 15:45:42 +01:00
philippe grand
9f798bc3fc fix : missing translation 2016-03-03 11:54:12 +01:00
philippe grand
59c4559a78 fix : missing translation 2016-03-02 21:13:12 +01:00
Juanjo Menent
c2c6d77caa FIX : Improve and add missing translations
As is not the branch develop, instead of transifex, we use GIT
2016-02-26 22:43:25 +01:00
Juanjo Menent
b34459c949 FIX : Improve and add missing translations
As is not the branch develop, instead of transifex, we use GIT
2016-02-26 22:31:36 +01:00
Juanjo Menent
7691e8c018 FIX : Improve and add missing translations
As is not the branch develop, instead of transifex, we use GIT
2016-02-26 22:17:22 +01:00
Laurent Destailleur
4b89b0b7aa Fix bad status translation for shipment 2016-02-24 22:13:29 +01:00
Laurent Destailleur
5d1241be2f Sync transifex 2016-02-24 12:10:25 +01:00
Laurent Destailleur
cfdaa0e13c Fix missing translation
Fix import of state
2016-02-22 14:49:30 +01:00
Laurent Destailleur
7def330f54 Fix missing error message and input lost in shipment create page 2016-02-20 03:58:52 +01:00
Laurent Destailleur
0faebc25ba Update translations 2016-02-19 19:33:31 +01:00
Laurent Destailleur
16c44af690 Fix bad example of setup to use 2016-02-19 02:44:56 +01:00
Laurent Destailleur
b0b2668428 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-18 23:21:22 +01:00
Laurent Destailleur
bc4c964b89 Several fixes in stock management (label, and bad action when lot module
is on)
2016-02-18 23:21:02 +01:00
Laurent Destailleur
633de3bcb4 Fix list of object referers should not be set to invoice by default (may
be module is disabed). I replace with a message to choose list.
2016-02-17 22:33:02 +01:00
aspangaro
f1a26cf54b Correct problem of merging for language file 2016-02-11 06:49:49 +01:00
aspangaro
87fee74fb1 Modify menu for accountancy module - New balance feature 2016-02-11 06:48:23 +01:00
aspangaro
b47252fcb6 Modifiy menu for accountancy module - New balance feature 2016-02-11 06:39:02 +01:00
aspangaro
eaca582cb5 Fixed: Problem of merging - Review page init accountancy again 2016-02-07 08:47:02 +01:00
Laurent Destailleur
806d3642d8 FIX Bad filter on opportunities
Conflicts:
	htdocs/core/class/html.formprojet.class.php
2016-02-06 15:09:57 +01:00
Laurent Destailleur
fd7a05490d DiscountOffered text was too long 2016-02-05 20:06:07 +01:00
Laurent Destailleur
640adcc666 Missing translation 2016-01-31 21:23:30 +01:00
Laurent Destailleur
129f5aad8e Fix bad translation 2016-01-30 15:56:04 +01:00
Laurent Destailleur
c6a6889d79 Merge pull request #4389 from aspangaro/3.9-p6
Fix: Some problems presentation on accountancy module
2016-01-30 13:04:22 +01:00
Laurent Destailleur
b162eb1bb0 Update translation for 3.9 2016-01-29 00:40:15 +01:00
Laurent Destailleur
99b2236260 FIX Selection of project must no show closed project 2016-01-28 12:19:13 +01:00
Laurent Destailleur
c8d232e056 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/contrat/card.php
2016-01-28 12:18:25 +01:00
Laurent Destailleur
25924f31ad Bad translation 2016-01-26 17:57:57 +01:00
aspangaro
73d5e7036f Refactoring eldy menu to test 2016-01-24 08:21:18 +01:00
Laurent Destailleur
cceeefb7c2 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/societe/index.php
2016-01-22 03:25:30 +01:00
Laurent Destailleur
4d2b5d71af Fix missing translation key 2016-01-17 17:35:02 +01:00
Marcos García
ca6c2b4317 Update products.lang 2016-01-15 09:49:52 +01:00
Laurent Destailleur
0951042dad Fix: no need of translation tab if multilang was disabled. 2016-01-14 15:00:31 +01:00
Laurent Destailleur
23dd6b8388 Fix bad management of option SOCIETE_DISABLE_PROSPECTS and
SOCIETE_DISABLE_CUSTOMERS
2016-01-14 12:35:55 +01:00
Laurent Destailleur
71b264dd86 FIX Bug: Delivery order and date are not displayed #4372
Link between shipment and delivery receipt was lost.
Status for receipt must not use same label than shipments.
2016-01-13 20:41:32 +01:00
aspangaro
3ff9fe3123 Fix: Add missing key language for propal 2016-01-09 08:26:08 +01:00
Laurent Destailleur
a8758fa5b7 Bug war week-end: Fix a duplicate page on holiday, fix missing badge on
some documents tabs.
2016-01-09 01:54:46 +01:00
Laurent Destailleur
0d8788e552 FIX It was not possible to define if leave type need to be followed by a
counter or not. Added also a message to ask user to finish setup if no
leave with counter was setup.
2016-01-09 01:18:53 +01:00
Laurent Destailleur
e79750dc89 I continue bug war week-end 2016-01-09 00:44:06 +01:00
Laurent Destailleur
127354f0af Minor fixes 2016-01-08 22:41:30 +01:00
Laurent Destailleur
c9176cd6b4 Missing translation 2016-01-08 18:22:41 +01:00
Laurent Destailleur
6a058edc23 Revert "Debug of module leave requests " 2016-01-08 14:15:22 +01:00
TBAI
8c48785de7 Debug of module leave requests
Add text in holiday module
2016-01-07 20:10:22 +01:00
Laurent Destailleur
4e2d4a6651 Fix: the new option AGENDA_USE_EVENT_TYPE_DEFAULT was not visible.
Solved this by completing tooltip info.
2016-01-07 11:01:37 +01:00
Laurent Destailleur
52cd5d505e Fix several bugs on css, translation or look 2016-01-01 23:44:23 +01:00