Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-13 03:12:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
40,390 Commits 39 Branches 191 Tags
f34aadef3df57794de74006bc2c2c9fc4da6be12
Commit Graph

40390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
187feff7d5 Prepare 3.3.3 2013-06-25 20:40:22 +02:00
Laurent Destailleur
0ec4b3bcdb Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-25 18:10:55 +02:00
Laurent Destailleur
f89860e0c4 Merge pull request #1067 from jfefe/3.4-fixfuser 
Add parameter to force user in dol_check_access_document function
 2013-06-25 06:55:20 -07:00
Laurent Destailleur
285ea8da3f More info into log 2013-06-25 15:47:59 +02:00
jfefe
54bf3fd516 Add parameter to force user in dol_check_access_document function 
This required by webservice where global $user is not available
 2013-06-25 15:09:51 +02:00
Laurent Destailleur
c2654fa7e2 Fix: Bad translation. Must use a different string than products 2013-06-25 15:00:10 +02:00
Maxime Kohlhaas
76870622e4 Add turnover report by product / serv 2013-06-25 14:54:29 +02:00
Maxime Kohlhaas
2a67d5230d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-06-25 14:47:08 +02:00
Laurent Destailleur
92306ca242 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-06-25 14:10:07 +02:00
Laurent Destailleur
2d0a85d6f8 New: Add option to send email when paypal or paybox payment is done. 2013-06-25 13:19:44 +02:00
simnandez
ca190be382 [Bug #958] LocalTax2 for Spain fails on Suppliers 2013-06-25 11:21:56 +02:00
Maxime Kohlhaas
b22b604d02 Accountancy code on user object in prevision of the complete accountancy module 2013-06-25 11:14:00 +02:00
simnandez
065b30f0d0 [Bug #958] LocalTax2 for Spain fails on Suppliers 2013-06-25 11:12:21 +02:00
Maxime Kohlhaas
109d1a71cb Merge 2013-06-25 11:00:48 +02:00
Maxime Kohlhaas
af5db04824 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-06-25 11:00:30 +02:00
Laurent Destailleur
b5391a0d39 Trans 2013-06-25 09:11:37 +02:00
Laurent Destailleur
1d8b9949d6 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/compta/bank/categ.php
	htdocs/compta/bank/releve.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/contacts.tpl.php
	htdocs/cron/list.php
	htdocs/main.inc.php
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/theme/bureau2crea/style.css.php
	htdocs/theme/eldy/style.css.php
	htdocs/user/class/user.class.php
	htdocs/viewimage.php
 2013-06-24 20:02:02 +02:00
Laurent Destailleur
7f3a06127a Fix: Bad regex 2013-06-24 19:55:23 +02:00
Laurent Destailleur
eb07c6b2e7 Fix: Missing left padding 2013-06-24 19:45:29 +02:00
Laurent Destailleur
8d04f5a805 Fix: warning 2013-06-24 19:36:10 +02:00
Laurent Destailleur
cba1d73dd4 Fix: Can autoselect warehouse if only one warehouse 2013-06-24 19:34:56 +02:00
Laurent Destailleur
31f2d8922d Fix: warning 2013-06-24 19:34:02 +02:00
Laurent Destailleur
a5ba59312d Fix: Fix some bug into script to detect bad utf8 and dos files 2013-06-24 19:03:33 +02:00
Laurent Destailleur
f8f0b08bfc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-06-24 18:33:00 +02:00
Laurent Destailleur
a8547b5375 New: Add property hidden into module descriptor to allow to hide a 
module according to some dynamic conditions.
 2013-06-24 18:31:56 +02:00
Regis Houssin
930f6e4850 Fix: avoid error with crlf 2013-06-24 18:04:06 +02:00
Regis Houssin
48ec594fe6 Fix: crlf 2 lf 2013-06-24 17:55:08 +02:00
Regis Houssin
307ae65924 Fix: crlf to lf for avoid errors with git clone 2013-06-24 17:43:27 +02:00
Regis Houssin
ae67496730 Fix: crlf to lf 2013-06-24 17:41:15 +02:00
Regis Houssin
4cd6ae6bbd Fix: convert lines delimiters 2013-06-24 17:36:33 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Regis Houssin
ba606bf2e9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-24 17:13:58 +02:00
Regis Houssin
cb9dcfa369 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-24 17:13:39 +02:00
Regis Houssin
aa7e61178a New: add product price sharing for multicompany 2013-06-24 17:13:08 +02:00
Regis Houssin
9992bebb13 New: add product price sharing for multicompany 2013-06-24 17:12:41 +02:00
Laurent Destailleur
7778a17a89 Qual: clean code from deprecated vars 2013-06-24 16:41:31 +02:00
Maxime Kohlhaas
ac205aac2d Add search on siren (idprof1) 2013-06-24 10:05:29 +02:00
Maxime Kohlhaas
0d3b7f1a0f merge 2013-06-24 10:01:23 +02:00
Maxime Kohlhaas
5bbf914abc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-06-24 10:00:55 +02:00
Laurent Destailleur
871c3d9d07 Fix: debug module cron 2013-06-23 22:30:33 +02:00
Laurent Destailleur
ec2e3db450 New: Switch cron module to status stable. Thanks to everybody to test 
this new module and debug it.
 2013-06-23 22:21:21 +02:00
Laurent Destailleur
949565dde4 Add param after 2013-06-23 19:55:37 +02:00
Laurent Destailleur
7fb8a740e7 Fix: bad function 2013-06-23 18:54:18 +02:00
Laurent Destailleur
7bfdec7993 Fix: css 2013-06-23 18:53:40 +02:00
Laurent Destailleur
db48acddb4 Fix: css 2013-06-23 18:51:49 +02:00
Laurent Destailleur
b49a1168e3 Fix: Use div for tables when there is a different form on each line. 2013-06-23 18:33:03 +02:00
Laurent Destailleur
e1bb3bafb7 Fix: css 2013-06-23 18:01:10 +02:00
Laurent Destailleur
1d2f09688e Merge remote-tracking branch 'origin/3.4' into develop 2013-06-23 14:38:33 +02:00
Laurent Destailleur
3662638064 Fix: Css for fieldset 2013-06-23 14:37:09 +02:00
Laurent Destailleur
355c770f97 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-23 13:04:00 +02:00