Commit Graph

52275 Commits

Author SHA1 Message Date
aspangaro
eaca582cb5 Fixed: Problem of merging - Review page init accountancy again 2016-02-07 08:47:02 +01:00
aspangaro
9d427d2248 Fixed: Missing link in eldy menu to init accountancy 2016-02-07 07:41:53 +01:00
Laurent Destailleur
84f4f2d40f FIX The search on user/group was not using new code. Fiels used for
search was not visible.
2016-02-07 02:55:56 +01:00
Laurent Destailleur
8a8aaf618d Fix: select to add box was lost 2016-02-07 02:22:10 +01:00
Laurent Destailleur
38e5b773ce Fix: can publish on foundation ref storage 2016-02-07 01:11:12 +01:00
Laurent Destailleur
426f6541e6 Fix: can publish on foundation ref storage 2016-02-07 01:05:53 +01:00
Laurent Destailleur
adb66eddf1 Fix generation of rpm packages 2016-02-06 18:15:54 +01:00
Laurent Destailleur
77c059f7e6 We must remove flash binary part 2016-02-06 17:24:54 +01:00
Laurent Destailleur
4c859999e8 Fix first install on debian. 2016-02-06 17:19:57 +01:00
Laurent Destailleur
c6fe8e5479 Fix first install on debian. 2016-02-06 17:13:24 +01:00
Laurent Destailleur
ebd9a97bab Prepare 3.9 2016-02-06 15:55:05 +01:00
Laurent Destailleur
58f728eae5 Prepare 3.9rc 2016-02-06 15:11:45 +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
3828fe7026 FIX Bad filter on opportunities 2016-02-06 15:06:37 +01:00
phf
d66bc6f1b3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_numbering_module_supplier_payment
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2016-02-06 12:57:30 +01:00
Laurent Destailleur
8f8c63e9c8 FIX Delete triggers must be before delete (reverse order compared to
create)
2016-02-06 12:37:48 +01:00
Laurent Destailleur
2e1011ca0c Add hidden option MAIN_CAN_HIDE_EXTRAFIELDS to disable a feature that
seems useless.
2016-02-06 12:29:02 +01:00
frederic34
e079021de3 data 2016-02-06 12:16:12 +01:00
frederic34
0d11d94234 Merge remote branch 'upstream/develop' into sticker
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-06 12:12:35 +01:00
frederic34
9c74af63af Dictionnary for label sticker and card format 2016-02-06 12:06:05 +01:00
BENKE Charlie
59c9d85275 Update boxes.lang 2016-02-05 23:38:04 +01:00
BENKE Charlie
e2afe5460e Update modSociete.class.php 2016-02-05 23:37:31 +01:00
BENKE Charlie
eb48e84b34 name of boxe file changed 2016-02-05 23:37:04 +01:00
Laurent Destailleur
fd7a05490d DiscountOffered text was too long 2016-02-05 20:06:07 +01:00
Sof
0cee4b016b FIX : Typo 2016-02-05 19:46:01 +01:00
Laurent Destailleur
96bf59f065 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-02-05 19:21:59 +01:00
Christophe Battarel
7a6c7f10a6 FIX: add missing global def for ttc column 2016-02-05 19:14:40 +01:00
Laurent Destailleur
36a29872b1 Merge pull request #4559 from fmarcet/3.8
FIX: Check stock of batch on shippment
2016-02-05 18:41:01 +01:00
Laurent Destailleur
7044e62afa Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-02-05 18:37:13 +01:00
Laurent Destailleur
bf7181a064 All messages separated with , into errorsToString 2016-02-05 18:37:01 +01:00
Laurent Destailleur
02c54f4ea6 Merge pull request #4573 from altatof/fix_ttc
FIX: retrieve correct pu_ttc (set by printObjectLine function) like in 3.7
2016-02-05 18:34:45 +01:00
Laurent Destailleur
cb66448148 Merge pull request #4564 from atm-ph/new_feature_hidden_extrafields
NEW feature hidden extrafields
2016-02-05 17:22:51 +01:00
Christophe Battarel
f0aef88589 better fix 2016-02-05 13:49:19 +01:00
Christophe Battarel
36c7697b63 FIX: retrieve correct pu_ttc (set by printObjectLine function) like in
3.7
2016-02-05 13:43:06 +01:00
abcnet-lu
a4dedfb169 Merge pull request #2 from Dolibarr/develop
Merge back official Dolibarr develop into my abcnet-lu fork
2016-02-05 13:00:43 +01:00
fmarcet
ede4453164 Fix: Avoid errors when batch stock is negative 2016-02-05 12:59:32 +01:00
fmarcet
01f2180822 Merge remote-tracking branch 'origin/3.8' into 3.8 2016-02-05 12:57:43 +01:00
Laurent Destailleur
713050bd57 Fix style on payment page 2016-02-05 12:46:41 +01:00
Laurent Destailleur
e1da95871a Fix bad name 2016-02-05 12:23:16 +01:00
Laurent Destailleur
062deae24c Merge 2016-02-05 12:18:50 +01:00
Laurent Destailleur
e9ee816826 Merge pull request #4561 from fappels/3.8
Fix #4556 Desired minimum stock and Stock limit for alert cleared on modify product
2016-02-05 11:12:31 +01:00
Laurent Destailleur
c9c5484805 Merge pull request #4570 from frederic34/patch-8
Update CMailFile.class.php
2016-02-05 10:58:42 +01:00
Laurent Destailleur
04043cdb31 Merge pull request #4569 from abcnet-lu/raisons-socials-luxembourg
Fix: legal forms and professional IDs in Luxembourg
2016-02-05 10:58:03 +01:00
Laurent Destailleur
d66d3c0a8f Merge pull request #4567 from defrance/patch-98
Add odt & pdf edition on product
2016-02-05 10:57:49 +01:00
Laurent Destailleur
0ae8a3398d Fix sql error when extrafields on contact 2016-02-05 10:56:45 +01:00
Laurent Destailleur
876bc2537c Merge pull request #4563 from atm-ph/fix_develop_list_socpeople
FIX list of contact
2016-02-05 10:55:01 +01:00
Laurent Destailleur
807e7b8304 Merge pull request #4560 from abcnet-lu/revert-develop-20160203
Fix : Add districts and cantons for Luxembourg
2016-02-05 10:53:51 +01:00
Laurent Destailleur
8e7b560cea Merge pull request #4562 from atm-ph/fix_formpropal_infinite_loop
FIX infinite loop
2016-02-05 10:51:49 +01:00
Laurent Destailleur
f518ef58bb Merge pull request #4557 from abcnet-lu/develop
Fix: Inverted labels of intermediary / reduced VAT rates for Luxembourg
2016-02-05 10:51:18 +01:00
Laurent Destailleur
5a2647906e Merge pull request #4530 from defrance/patch-96
Add hook on contacttpl
2016-02-05 10:50:40 +01:00