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

37710 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BENKE Charles
468f6fd5fb Update modFournisseur.class.php 
Add extrafields export feature on bill
 2014-04-29 11:57:51 +02:00
BENKE Charles
b283ed73d1 Update modFacture.class.php 
add export extrafields feature
 2014-04-29 11:53:04 +02:00
BENKE Charles
0a1f483fd1 Update fiche.php 
Add feature to change refnumber of bank bordereau
 2013-07-21 10:10:49 +02:00
BENKE Charles
9f14ee8846 Update remisecheque.class.php 
add change number of remisecheque feature with the real number of the bank
 2013-07-21 10:08:58 +02:00
Laurent Destailleur
f02fa8a41d Fix: css when using checkbox into label 2013-06-26 17:58:34 +02:00
Laurent Destailleur
b5b07f8a14 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-26 16:46:01 +02:00
Laurent Destailleur
696ad07871 LF 2013-06-26 16:45:42 +02:00
Laurent Destailleur
58bdac2dcd Merge pull request #1066 from atm-maxime/develop 
Add search on siren (idprof1)
 2013-06-26 07:41:07 -07:00
Laurent Destailleur
6a83345f89 Merge pull request #1068 from csalvador/formfilehook 
Formfile hook
 2013-06-26 07:37:20 -07:00
Cédric Salvador
117ddbdff2 add columns if active hooks use the formBuilddocLineOptions method 2013-06-26 15:20:42 +02:00
Cédric Salvador
bfedddd95e init hook 2013-06-26 15:20:16 +02:00
Cédric Salvador
df94f3816c add hook to add line options in html.formfile.class.php 2013-06-26 15:19:59 +02:00
Cédric Salvador
59f99c416b CRLF to LF 2013-06-26 15:19:02 +02:00
Laurent Destailleur
1de8ab3785 Fix: CSS 2013-06-26 14:38:56 +02:00
Laurent Destailleur
5f67142fc1 Start prototype for datatable 2013-06-26 11:58:01 +02:00
Laurent Destailleur
882d34fa88 Fix: css 2013-06-26 11:40:29 +02:00
Laurent Destailleur
9b235f6879 Fix: Remove space at end of binary files 2013-06-26 02:05:18 +02:00
Laurent Destailleur
af4651f1a2 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/perl/virtualmin/dolibarr.pl
	htdocs/core/lib/files.lib.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/webservices/server_other.php
 2013-06-25 23:22:00 +02:00
Laurent Destailleur
8359a34545 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
 2013-06-25 21:31:24 +02:00
Laurent Destailleur
2af8f295b1 Fix: warning not always visible. Depends if addon modules were 
installed. Var should provide a quick fix.
 2013-06-25 21:25:09 +02:00
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