Commit Graph

50153 Commits

Author SHA1 Message Date
Laurent Destailleur
ebf31d87ea Merge pull request #5234 from frederic34/patch-7
Fix next month or next year in opensurvey
2016-05-22 14:23:30 +02:00
Frédéric FRANCE
9e5db0f3c6 Fix next month or next year in opensurvey
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/55209-bug-calendrier-opensurvey-v3-9
2016-05-21 09:18:16 +02:00
Laurent Destailleur
12a5fbbea7 Merge pull request #5191 from FHenry/3.8
Fix email template edition
2016-05-18 20:35:42 +02:00
Laurent Destailleur
24673d066f Merge pull request #5216 from atm-maxime/fix_dispatch_services_on_supplier_order
FIX services dispatch on supplier order only if STOCK_SUPPORTS_SERVICES
2016-05-18 20:27:31 +02:00
Laurent Destailleur
517b189df2 Merge pull request #5225 from hregis/3.8_bug
Fix: doublon (merge problem?)
2016-05-18 17:39:14 +02:00
Regis Houssin
c7dda59fbc Fix: doublon (merge problem?) 2016-05-18 17:33:51 +02:00
Laurent Destailleur
43cb646779 Merge pull request #5219 from fmarcet/3.8
Fix: Expensereport not compatible with multicompany
2016-05-18 13:52:45 +02:00
Laurent Destailleur
a4b497ef81 Merge pull request #5212 from atm-alexis/3.8_fix_hook_called_but_not_initialized
FIX 3.8 hook on group card called but not initialized
2016-05-18 13:50:21 +02:00
Laurent Destailleur
94c532dd8a Clean splitted lines into llx_product_batch 2016-05-16 23:58:06 +02:00
Laurent Destailleur
929787006e Clean data 2016-05-16 22:40:29 +02:00
Your Name
f7c9f20b16 Fix: Expensereport not compatible with multicompany. 2016-05-16 17:21:32 +02:00
Maxime Kohlhaas
af8608ab7a Fix services dispatch on supplier order only if STOCK_SUPPORTS_SERVICES 2016-05-16 10:49:43 +02:00
Alexis Algoud
b3b064d310 FIX hook on group card called but not initialized 2016-05-14 18:58:14 +02:00
Laurent Destailleur
2b225c76d7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-05-13 23:13:16 +02:00
Laurent Destailleur
1bba8166f8 FIX #5207 2016-05-13 23:12:53 +02:00
Laurent Destailleur
7c26f328bb Merge pull request #5190 from atm-ph/fix_3.8_update_ref_fourn_on_supplier_invoice
Fix update supplier ref on supplier invoice
2016-05-13 20:29:09 +02:00
Laurent Destailleur
a5e3503598 Merge pull request #5187 from atm-gauthier/3.8_fix_param_fetch_company
FIX : can't fetch by siret or siren because of first "if"
2016-05-13 20:28:46 +02:00
Laurent Destailleur
82ea686bc0 Merge pull request #5182 from atm-maxime/fix_contract_line_creation
Fix contract line creation
2016-05-13 20:26:41 +02:00
Florian HENRY
4cbab1cf47 FIX PROPAL_MERGE_PDF with PRODUCT_USE_OLD_PATH 2016-05-12 16:58:14 +02:00
Florian HENRY
d3b3e60d82 Fix email template edition 2016-05-10 22:37:30 +02:00
phf
a57e0f5fd3 Fix update supplier ref on supplier invoice 2016-05-10 14:27:24 +02:00
Florian HENRY
1c0bdfcf1e Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-05-10 14:15:22 +02:00
gauthier
84e75eed88 FIX : can't fetch by siret or siren because of first "if" 2016-05-10 09:31:25 +02:00
Maxime Kohlhaas
6278610d0a Fix contract line creation should take desc even if not displayed on screen 2016-05-09 15:32:21 +02:00
Maxime Kohlhaas
03732fd1aa Fix contract line creation was adding all proposal lines desc 2016-05-09 15:31:44 +02:00
Laurent Destailleur
06eeb0ced4 Merge pull request #5141 from aspangaro/3.8-p3
FIX: Accountancy - 3.8 - Chart of accounts are limited on only one country
2016-05-05 22:28:08 +02:00
aspangaro
e6843a64ae FIX: Accountancy - 3.8 - Chart of accounts are limited on only one country 2016-04-30 07:13:23 +02:00
Laurent Destailleur
53386e22ea Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/expedition/class/expedition.class.php
	htdocs/index.php
2016-04-29 20:39:17 +02:00
Laurent Destailleur
0735413e7c Merge pull request #5101 from altatof/fix_fournprice_select
FIX: end of select when no fournprice
2016-04-29 20:36:44 +02:00
Laurent Destailleur
b94295e4ca Merge pull request #5102 from atm-alexis/3.8
FIX search on date into supplier invoice list
2016-04-29 18:45:04 +02:00
Laurent Destailleur
b0977e3e2a Merge pull request #5122 from fmarcet/3.8
FIX: Not filtering correctly when come from dashboard
2016-04-29 17:40:03 +02:00
Laurent Destailleur
59a30cd2e7 Merge pull request #5120 from atm-maxime/fix_total_on_cabyprodserv
Fix wrong qty total in ca by prod/serv report
2016-04-29 17:39:40 +02:00
Laurent Destailleur
b0b1056a44 Merge pull request #5121 from fmarcet/3.7
Fix: Not filtering correctly on supplier invoice's list
2016-04-29 17:19:15 +02:00
Laurent Destailleur
8a4871323d Merge pull request #5022 from marcosgdf/bug-5008
FIX #5008 SQL error when editing the reference of a supplier invoice that already exists
2016-04-29 17:01:01 +02:00
Laurent Destailleur
f91a8934bd Merge remote-tracking branch 'origin/3.7' into 3.8 2016-04-29 15:17:11 +02:00
Laurent Destailleur
211d217f8c Merge remote-tracking branch 'origin/3.6' into 3.7 2016-04-29 15:13:27 +02:00
Laurent Destailleur
2a27fe02eb Fix detection if tag already exists 2016-04-29 15:12:58 +02:00
Florian HENRY
b280a700d2 FIX missing column when module was installed before standard integration 2016-04-28 14:05:56 +02:00
fmarcet
d599261d20 FIX: Not filtering correctly when come from dashboard 2016-04-28 10:38:50 +02:00
Ferran Marcet
7380676717 Fix: Not filtering correctly on supplier invoice's list 2016-04-28 10:25:55 +02:00
Maxime Kohlhaas
0a67614e72 Fix wrong qty total in ca by prod/serv report 2016-04-28 09:10:22 +02:00
Florian HENRY
bfbb1c20bc FIX bug on email template 2016-04-27 09:27:59 +02:00
Florian HENRY
94d92d3cbb Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-04-26 10:26:45 +02:00
Christophe Battarel
2a0c508d47 FIX: end of select when no fournprice 2016-04-25 11:26:13 +02:00
Alexis Algoud
1746f8f96c FIX search on date into supplier invoice list dont work because of status -1 2016-04-25 11:25:49 +02:00
Marcos García de La Fuente
d98e50e661 Little change 2016-04-23 13:44:43 +02:00
Laurent Destailleur
25810ddfc8 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/compta/localtax/quadri_detail.php
	htdocs/core/lib/tax.lib.php
2016-04-22 20:08:33 +02:00
Laurent Destailleur
68e96b98c5 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
2016-04-22 20:02:34 +02:00
Laurent Destailleur
7f5670cb26 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	ChangeLog
2016-04-22 19:49:27 +02:00
Laurent Destailleur
d2003e9607 Merge pull request #5058 from philippe-opendsi/patch-2
FIX #5048 Product supplier list display only one product
2016-04-22 19:44:16 +02:00