Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
32,302 Commits 36 Branches 189 Tags
72dbeadc49864a0dd871788aa6fdf80fabecc4bc
Commit Graph

32302 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
72dbeadc49 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr.git into 3.2 2013-01-17 17:45:41 +01:00
Laurent Destailleur
8fec37d5ad Fix: error set on non object 2013-01-17 14:36:08 +01:00
Laurent Destailleur
b826a6b559 Merge pull request #612 from FHenry/3.2 
Fix Bug [ bug #681 ] Can't modify a line a business proposal
 2013-01-15 14:13:19 -08:00
fhenry
085dee1ab1 Fix Bug [ bug #692 ] Can't search for suppliers invoice 2013-01-15 23:00:17 +01:00
fhenry
5e9a9a48f3 Fix Bug [ bug #681 ] Can't modify a line a business proposal 2013-01-15 22:45:18 +01:00
Laurent Destailleur
ec17511e01 Fix: not object error with option SERVICE_ARE_ECOMMERCE_200238EC 2013-01-13 18:53:52 +01:00
Laurent Destailleur
99c461b9d1 Merge branch '3.2' of git@github.com:Dolibarr/dolibarr.git into 3.2 2013-01-06 13:17:17 +01:00
Laurent Destailleur
4a2c38a1c1 Fix: Lost button 2013-01-06 13:16:25 +01:00
Laurent Destailleur
585d1b0587 Merge pull request #571 from KreizIT/3.2 
Security fix emailing read and unsubscribe
 2013-01-04 08:16:11 -08:00
Cedric GROSS
b4ad2887a0 Security fix emailing read and unsubscribe 
unsubscribe can lead to email disclosure
 2013-01-04 13:01:48 +01:00
Laurent Destailleur
6aebf470f6 Merge pull request #558 from FHenry/3.2 
Fix [ bug #658 ] Seacrh on bank do not work for description
 2012-12-29 08:32:37 -08:00
fhenry
24721eb3e8 Fix [ bug #658 ] Seacrh on bank do not work for description 2012-12-29 15:59:14 +01:00
Laurent Destailleur
4a74ebc1f9 Fix: [ bug #651 ] FusionPDF created files cannot be deleted 2012-12-27 14:46:50 +01:00
Laurent Destailleur
80bbeaa9b5 Fix: Migration of payment id not complete 2012-12-27 01:22:31 +01:00
Laurent Destailleur
1038e86616 Fix: Correct recipient into rouget template. 2012-12-13 01:21:37 +01:00
Laurent Destailleur
217b4ea15f Fix: Update changelog 2012-12-13 01:20:24 +01:00
Laurent Destailleur
0b0a30d362 Fix: Bad position of field with non A4 pages 2012-12-12 20:59:40 +01:00
Laurent Destailleur
19e0c66efc Fix: Using bad root url. 2012-12-12 14:48:31 +01:00
Laurent Destailleur
48eec88cba Fix: force redirect to https could not work for some environments 
Conflicts:
	htdocs/main.inc.php
 2012-12-12 02:40:01 +01:00
Laurent Destailleur
f8f3b2dc39 Fix: Bad url forging 2012-12-12 00:54:36 +01:00
Laurent Destailleur
d8aa8051dc Fix: Personalizing css fails when multicompany is on. Cache must differ 
between each environment.
3.2.3 		2012-12-08 18:42:29 +01:00
Laurent Destailleur
a7e1a45571 Fix: Use different css cache file for each user. This fix problem when 
using personalised constants that change style.
 2012-12-08 18:40:41 +01:00
Laurent Destailleur
60486417c3 Test. Try to create a backport branch. 2012-12-02 19:55:42 +01:00
Laurent Destailleur
c9ee9c7a38 Fix: pdf_getPDFFontSize must be after pdf_getInstance 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
 2012-11-28 19:26:08 +01:00
Laurent Destailleur
8f3f28c28f Fix: language translation for araby saudia 2012-11-27 14:19:04 +01:00
Laurent Destailleur
ac8a21a3d9 Added english (arabi saudia) 2012-11-27 11:34:15 +01:00
Laurent Destailleur
769c30de9d Fix: [ bug #607 ] Nom de société avec guillemets 2012-11-26 16:12:30 +01:00
Laurent Destailleur
2b926978ae Fix: Correct vat 2012-11-14 20:50:00 +01:00
Laurent Destailleur
6540451078 Fix: firstname was missing 2012-11-14 19:04:34 +01:00
Laurent Destailleur
3ea1345a5b Fix: Option MAIN_MAIL_SENDMAIL_FORCE_BA and MAIN_FIX_BUGGED_MTA was not 
complete.
 2012-11-14 01:22:48 +01:00
Laurent Destailleur
0d35892003 Fix: typo error 2012-11-13 11:14:44 +01:00
Regis Houssin
8a8c2170cc Fix: remove unused code 2012-11-12 09:44:41 +01:00
Laurent Destailleur
599300dfec Fix: Regression 2012-11-11 15:44:23 +01:00
Regis Houssin
1e6e7af9f7 Fix: wrong access rights 2012-11-10 08:21:56 +01:00
Laurent Destailleur
56cd154258 Fix: New vat for switzerland 2012-11-08 12:14:44 +01:00
Regis Houssin
2f476aa0a0 Fix: compatibility with multicompany 2012-11-06 14:54:17 +01:00
Laurent Destailleur
47d7ea1813 Removed tables of module 2012-11-06 12:29:45 +01:00
Laurent Destailleur
47d5c5baad Fix: Bad label when validating/paying an invoice from POS module 2012-11-03 17:01:05 +01:00
Laurent Destailleur
91fdb6a569 Fix: Not enought space for free text. To avoid to edit again and again 
value for all templates, I added an option to be able to fix template
onto production when space is not enough.

Conflicts:
	htdocs/core/modules/action/rapport.pdf.php
	htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/project/pdf/pdf_baleine.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2012-11-03 13:41:33 +01:00
Laurent Destailleur
1997b029c7 Fix: [ bug #592 ] stock sold value is wrong 2012-11-03 12:38:16 +01:00
Laurent Destailleur
753400ccf5 Fix: Label for payment by cheque using the wrong translation key 
Fix: Option to overwrite translation did not work as expected
Fix: Bad translation for greece
 2012-11-02 15:46:46 +01:00
Laurent Destailleur
b83a4d4815 Fix: crazy pagebreak when warterwark is higher than free space. 2012-11-02 15:44:34 +01:00
Laurent Destailleur
8127ced19b Fix: Trick to solve easily problem of font for some foreign users. 2012-10-31 19:42:16 +01:00
Laurent Destailleur
8bd2f9cfb5 Fix: Fix pagebreak. Fix also position for non A4 format. 2012-10-31 17:14:11 +01:00
Laurent Destailleur
0b3a2b744e Fix: Preview of delivery receipts 2012-10-31 16:57:48 +01:00
Laurent Destailleur
cd992d553e Fix: The bottom margin is already included into heightforfooter 
This provide 1cm more for product description.
Fix: Some code was not merged from previous fix (must not show free text
on all pages)

Conflicts:
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2012-10-30 18:52:55 +01:00
Laurent Destailleur
db00ca9dd7 Fix: Free text overlap data when not on last page. 
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/project/pdf/pdf_baleine.modules.php
 2012-10-30 14:15:35 +01:00
Laurent Destailleur
542dc8f98f Fix: Bad code for specimen 2012-10-30 11:58:38 +01:00
Laurent Destailleur
497aa9c453 Fix: Using a more precise function to calculate free texts height avoid 
having few pixels offset on free texts.
 2012-10-30 11:15:37 +01:00
Laurent Destailleur
c80badafe0 Fix: Revert direction of option (this information is a legal issue for 
most countries). Also, i removed the mandatory test, this is required
for invoices, not proposals.
So now, there is no need to hide by default because test on invoice
setup has been removed, so we can show by default (if defined) and use
option to force to hide if we want.
 2012-10-29 11:38:58 +01:00