lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,641 Commits 43 Branches 150 Tags 886 MiB
a89a4ee81a
Commit Graph

37641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
a89a4ee81a Fix: Delete vat entry when bank line was already deleted. 2013-12-09 22:39:41 +01:00
Laurent Destailleur
705192215a Merge pull request #1341 from marcosgdf/bug-1182 
Resolved bug #1182: ODT company_country tag is htmlencoded
 2013-12-08 16:49:50 -08:00
Laurent Destailleur
825640d645 Fix: Missing special code into export 2013-12-08 21:24:59 +01:00
Marcos García de La Fuente
beb93e9245 Resolved bug #1182: ODT company_country tag is htmlencoded 2013-12-08 20:23:44 +02:00
Laurent Destailleur
d8cd7571ec Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-12-07 18:48:31 +01:00
Laurent Destailleur
b637b28c8b Update ignore files 2013-12-07 18:47:58 +01:00
Laurent Destailleur
73e60e0629 Fix: Mass update of vat must work also for supplier prices 
Conflicts:
	htdocs/product/admin/product_tools.php
 2013-12-07 12:06:41 +01:00
Laurent Destailleur
d4c007a909 Merge pull request #1335 from FHenry/3.4 
[ bug #1174 ] Product translated description not good into PDF  Country
 2013-12-04 09:39:18 -08:00
Florian Henry
c2a8967b52 Much better fix for translated product description into PDF 2013-12-03 17:06:19 +01:00
Florian Henry
bc4cfd66db Fix: fix unsubscribe URL into mailing when sending manually (not by 
script)
 2013-12-02 15:07:34 +01:00
Florian Henry
3e712c9c8c Finnaly make it works 2013-12-02 11:11:08 +01:00
Florian Henry
0907d81fcb Avoid strpos bug if string is empty or null 2013-12-02 11:05:07 +01:00
Florian Henry
1ad1b25f6e remove useless space 2013-12-02 10:29:58 +01:00
Florian Henry
1b38d36f28 Better Fix 2013-12-02 10:27:41 +01:00
Florian Henry
c0ef63fd74 Bteer fix 2013-12-02 00:22:49 +01:00
Florian Henry
ff9c84fd0e Better test for HTMLentities desc translation 2013-12-02 00:20:50 +01:00
Florian Henry
11efc20755 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 
Conflicts:
	ChangeLog

Change-Id: I90f7ee62c65ef449c8ca43857d9743d0d953cf4b
 2013-12-01 22:50:18 +01:00
Florian Henry
c6991f97d4 [ bug #1174 ] Product translated description not good into PDF 
Country
 2013-12-01 22:47:22 +01:00
Laurent Destailleur
4aea74d6fd Fix: [ bug #1171 ] Documents lost in interventions after validating 2013-12-01 21:05:22 +01:00
Laurent Destailleur
c54c06e8d3 Fix: [ bug #1171 ] Documents lost in interventions after validating 2013-12-01 21:04:52 +01:00
Laurent Destailleur
131bbce6f3 Update changelog 2013-12-01 20:17:22 +01:00
Laurent Destailleur
2f88406677 Fix: [ bug #1075 ] POS module doesn't decrement stock of products in 
Delayed payment mode.
 2013-12-01 20:15:08 +01:00
Laurent Destailleur
fdc1209986 Fix: [ bug #1163 ] SQL Error when searching for supplier orders 
Conflicts:
	ChangeLog
 2013-12-01 18:12:15 +01:00
Laurent Destailleur
eaa6d987b6 Fix: When database is not synchronized with dir, we clean database. 2013-12-01 17:32:05 +01:00
Laurent Destailleur
84e3457023 Fix: [ bug #1161 ] Search on product label 2013-12-01 16:30:35 +01:00
Laurent Destailleur
8f1a553395 Fix: [ bug #1162 ] Traduction des mi-journées 2013-12-01 16:22:06 +01:00
Laurent Destailleur
395066519b Fix: [ bug #1163 ] SQL Error when searching for supplier orders 2013-12-01 16:18:18 +01:00
Laurent Destailleur
8d1e10cd76 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-12-01 16:02:19 +01:00
Laurent Destailleur
71a85464d5 Check parameters of script 2013-12-01 15:22:29 +01:00
Laurent Destailleur
a7c246cec1 Check parameters of script 2013-12-01 15:21:58 +01:00
Laurent Destailleur
e4860679de Merge pull request #1327 from FHenry/3.4 
[ bug #1159 ] Commercial search "other" give p.note do not exists
 2013-11-29 03:18:13 -08:00
Florian Henry
b9d37fd6f7 [ bug #1159 ] Commercial search "other" give p.note do not exists 2013-11-28 14:28:03 +01:00
Laurent Destailleur
894e6a296f Merge pull request #1324 from FHenry/3.4 
Fix [ bug #1156 ] Update TVA mass update tools do not work
 2013-11-27 16:09:35 -08:00
Florian Henry
2178ab6007 Fix [ bug #1156 ] Update TVA mass update tools do not work 2013-11-27 22:05:29 +01:00
Laurent Destailleur
216e9b390d Merge pull request #1321 from FHenry/3.4 
Fix [ bug #1145 ] Agenda button list type do not display
 2013-11-24 12:16:27 -08:00
Laurent Destailleur
1ddf9f6ac5 Fix: Not coherent filename 2013-11-24 19:34:25 +01:00
Laurent Destailleur
baebc7e91d Fix: Not coherent filename 2013-11-24 19:33:22 +01:00
Florian Henry
f1d0879419 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-24 18:07:47 +01:00
Florian Henry
8f9143cef7 revert param_ihm 2013-11-24 18:07:40 +01:00
Laurent Destailleur
65b6dca554 Fix: business rule to protect button and action was not synchronized 2013-11-24 13:46:40 +01:00
Florian Henry
6615ee7e6f [ bug #1148 ] Product consomation : supplier order bad status 2013-11-23 14:59:28 +01:00
Florian Henry
cca303cee6 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-22 15:07:16 +01:00
Florian Henry
f852c9a5bb Fix [ bug #1145 ] Agenda button list type do not display 2013-11-22 14:43:15 +01:00
Laurent Destailleur
6f5e78d27e Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-21 18:42:14 +01:00
Laurent Destailleur
29e029161f Fix: Restore translation lost because entry was not set into en_US lang. 2013-11-21 18:41:06 +01:00
Florian Henry
ea0bbb5896 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-21 12:29:03 +01:00
Florian Henry
7f950d8b45 Fix user pram_ihm, display tab and allow modify button only is user 
right allow it is OK
 2013-11-21 12:28:51 +01:00
Laurent Destailleur
0d853cf73d Fix: [ bug #1118 ] Minor problem on print page link 2013-11-21 02:49:22 +01:00
Laurent Destailleur
e63dcc5343 Fix: [ bug #1119 ] If no country is selected for a warehouse or thids 
card,
broken IMG is shown
 2013-11-21 02:14:25 +01:00
Laurent Destailleur
23f7de0873 Fix: [ bug #1094 ] Invoice Text Reminder 
Conflicts:
	htdocs/compta/facture.php
 2013-11-21 02:07:13 +01:00