Commit Graph

67255 Commits

Author SHA1 Message Date
Laurent Destailleur
b25c7e44d3
Merge pull request #8816 from atm-gauthier/6.0_fix_test_before_delete_invoice
FIX : test is_erasable() must be done before call function delete()
2018-05-25 11:05:20 +02:00
Laurent Destailleur
0a581e48d4
Update card.php 2018-05-25 11:04:04 +02:00
Laurent Destailleur
8303dc1e6f
Merge pull request #8815 from atm-florian/develop_fixproject
NEW: add filter on project task list
2018-05-25 10:56:10 +02:00
Laurent Destailleur
034752dc0b
Update tasks.php 2018-05-25 10:54:17 +02:00
Laurent Destailleur
e7cfad0e60
Update tasks.php 2018-05-25 10:52:24 +02:00
Laurent Destailleur
c56ef86bc3
Update project.lib.php 2018-05-25 10:50:16 +02:00
Laurent Destailleur
973384604e
Merge pull request #8850 from grandoc/new_branch_24_05_2018
clean and update code
2018-05-25 10:45:39 +02:00
Laurent Destailleur
fbcaf8872b
Merge pull request #8808 from atm-john/Add_table_thead_and_tbody
Add table thead and tbody for object lines
2018-05-25 10:42:26 +02:00
Laurent Destailleur
04586fab66
Merge pull request #8824 from ggg44473/7.0
Fix sql error accounting account
2018-05-25 10:41:16 +02:00
Laurent Destailleur
02803f9284
Merge pull request #8821 from aspangaro/8.0-b26
Fix Loan : Move to Loadlangs / Remove oldcode (calc) / Presentation / Small problems
2018-05-25 10:36:46 +02:00
Laurent Destailleur
205732e240
Merge pull request #8822 from aspangaro/8.0-b27
Salaries : Move to LoadLangs
2018-05-25 10:34:36 +02:00
Laurent Destailleur
f416f9629e
Merge pull request #8840 from all3kcis/patch-9
Add oldcopy on productlot::update()
2018-05-25 10:22:18 +02:00
Laurent Destailleur
d99684f9aa
Merge pull request #8842 from GPCsolutions/develop-unittesttypo
Fix typo
2018-05-25 10:16:36 +02:00
Laurent Destailleur
545133960e
Merge pull request #8849 from atm-quentin/FIX_missing_filters_during_ordering
FIX missing filters during reordering
2018-05-25 10:15:20 +02:00
Laurent Destailleur
5d5638d906
Merge pull request #8848 from frederic34/typo
typo
2018-05-25 10:14:41 +02:00
Laurent Destailleur
3816b18c27
Merge pull request #8856 from glu000/7.0
FIX: It's not possible to remove a contact which is assigned to an event #8852
2018-05-25 10:14:19 +02:00
Laurent Destailleur
923fcfb36e
Merge pull request #8854 from glu000/develop
FIX: It's not possible to remove a contact which is assigned to an event #8852
2018-05-25 10:14:05 +02:00
Laurent Destailleur
76b34a5a60
Merge pull request #8857 from aspangaro/8.0-b28
FIX : Replace feature level 2 by a constant on accountancy journal
2018-05-25 10:13:20 +02:00
Laurent Destailleur
b9fbf13eba Fix look and feel v8 2018-05-25 09:36:49 +02:00
Laurent Destailleur
9f2f8ca7e0 Fix scrutinizer 2018-05-25 09:31:16 +02:00
Alexandre SPANGARO
46a251a2b3 FIX : Replace feature level 2 by a constant on accountancy journal 2018-05-24 21:13:48 +02:00
Alexandre SPANGARO
d1e1d64b42 Add some information in bank_journal 2018-05-24 20:26:38 +02:00
Alexandre SPANGARO
7d2d818679 Fix link 2018-05-24 20:25:06 +02:00
Günter Lukas
3adfce35e2
Update card.php 2018-05-24 13:32:13 +02:00
Günter Lukas
1b237a75b9
Update card.php 2018-05-24 13:31:23 +02:00
Laurent Destailleur
23e2bb20d9 Look and feel v8 2018-05-24 12:32:04 +02:00
Laurent Destailleur
e51aa68284 Fix link to warehouses for events 2018-05-24 12:16:04 +02:00
Frédéric FRANCE
0623ff7667
fix logic 2018-05-24 11:56:19 +02:00
Laurent Destailleur
de447d88d7 Fix translation 2018-05-24 11:51:32 +02:00
florian HENRY
436a1001b3 fix : avoid Notice: Undefined property: stdClass::$MAIN_FEATURES_LEVEL
on upgrade.php page where global is not yet defined
2018-05-24 10:56:01 +02:00
Philippe GRAND
11b63325bf clean and update code 2018-05-24 10:48:03 +02:00
atm-quentin
eb224e43a5 FIX missing filters during ordering 2018-05-24 10:41:24 +02:00
Laurent Destailleur
3f24f5ef78 Fix css 2018-05-23 18:19:59 +02:00
Laurent Destailleur
488c0c030e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modProduct.class.php
2018-05-23 18:09:25 +02:00
Laurent Destailleur
4967c678b8 Fix translation 2018-05-23 18:05:19 +02:00
Laurent Destailleur
3a06918b16 FIX Missing extrafields in export of stock or products 2018-05-23 18:00:27 +02:00
Laurent Destailleur
d1d8494666 FIX Missing extrafields in export 2018-05-23 17:48:18 +02:00
Frédéric FRANCE
1b69c2357f
typo 2018-05-23 17:16:58 +02:00
Frédéric FRANCE
8547827575
Merge remote-tracking branch 'upstream/develop' into multipriceqty 2018-05-23 17:06:02 +02:00
Frédéric FRANCE
efbb053e54
PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES 2018-05-23 17:05:08 +02:00
Raphaël Doursenaud
be78c37985
Fix typo 2018-05-23 11:37:12 +02:00
Marc de Lima Lucio
111f3a9649 FIX: pdf: overlap when linked elements and incoterms/public note displayed + port PR #8155 into supplier docs & contracts 2018-05-23 11:11:33 +02:00
All3kcis
4bfd8b5539
Add oldcopy on productlot::update() 2018-05-23 10:38:24 +02:00
ATM-Nicolas
734ecbc9b5 FIX : Fetch shipping will now fetch project id 2018-05-23 09:47:29 +02:00
Laurent Destailleur
f58e0d3bcf Fix scrutinizer errors 2018-05-23 08:24:20 +02:00
Laurent Destailleur
a1c799507a Fix $contactobject not always defined 2018-05-23 08:16:24 +02:00
Laurent Destailleur
d072c2eb5d Fix turnover invoiced by vat rate and country. Use fiscal month start. 2018-05-22 23:09:27 +02:00
Laurent Destailleur
354198b31e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/societe/contact.php
2018-05-22 20:26:09 +02:00
Laurent Destailleur
f074daae48 Fix option MAIN_MAIL_ENABLED_USER_DEST_SELECT 2018-05-22 20:17:31 +02:00
Laurent Destailleur
2a579b707a FIX javascript showempty error
FIX Contact tab not visible when using canvas
2018-05-22 19:43:28 +02:00