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

50060 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
0bfccc7255 Fix print into form to attach file must be into return. 2015-09-12 11:35:56 +02:00
Laurent Destailleur
309e1604e1 Fix migration missing for leave request module 
Fix permission label for expense report and leave request
 2015-09-12 11:35:49 +02:00
Laurent Destailleur
24a216b154 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-09-12 11:33:49 +02:00
Laurent Destailleur
06d19a5a40 Work on a new widget 2015-09-12 11:33:22 +02:00
Laurent Destailleur
5bc74ad6ea Fix SQL injections #3300 2015-09-12 11:23:44 +02:00
Laurent Destailleur
a3032d5674 Merge pull request #3504 from fappels/3.5-patch-Dispatch-rounding 
Fix #3471 3.5 Rounding issue when dispatching non-integer
 2015-09-12 11:07:55 +02:00
Laurent Destailleur
a83b3ae7e8 Merge pull request #3503 from fappels/3.7-dispatch-rounding 
Fix #3471 3.7 Rounding issue when dispatching non-integer
 2015-09-12 11:07:16 +02:00
Laurent Destailleur
5e81eb7586 Merge pull request #3505 from GPCsolutions/firephp 
Setup FirePHP like ChromePHP
 2015-09-12 11:02:31 +02:00
Laurent Destailleur
ff1b18ff46 Merge pull request #3501 from FHenry/develop 
NEW : Import link between thirdparties and sales representatives
 2015-09-12 11:01:04 +02:00
Laurent Destailleur
e1a92c8288 Merge pull request #3506 from atm-maxime/3.6 
Fix multientity stock management (F.Henry followup)
 2015-09-12 10:58:26 +02:00
Maxime Kohlhaas
c6081f0fa2 Fix multientity stock management (F.Henry followup) 2015-09-11 20:38:32 +02:00
Laurent Destailleur
6318b12aeb Fix confirmation of scripts make scripts not working with cron 2015-09-11 20:36:45 +02:00
Raphaël Doursenaud
fc91e553ad Setup FirePHP like ChromePHP 2015-09-11 17:45:30 +02:00
Laurent Destailleur
1401debace Fix print into form to attach file must be into return. 2015-09-11 08:32:40 +02:00
Laurent Destailleur
4b97fae28f Fix migration missing for leave request module 
Fix permission label for expense report and leave request
 2015-09-11 07:52:06 +02:00
fappels
c290840513 Revert "Fix delete not used empty stock record" 
This reverts commit 1d85529eda.
 2015-09-10 23:31:23 +02:00
fappels
75a14e02d8 Fix #3471 3.7 Rounding issue when dispatching non-integer 2015-09-10 23:29:13 +02:00
fappels
8bdfdc0127 Fix #3471 3.5 Rounding issue when dispatching non-integer 2015-09-10 23:12:27 +02:00
fappels
249883dda2 Merge remote-tracking branch 'Dolibarr/3.5' into 3.5 2015-09-10 22:19:41 +02:00
fappels
a294700cef fix dispatch rounding version 1 2015-09-10 22:16:03 +02:00
Laurent Destailleur
7951483c5f Fix: examples ko for import 
Fix bad picto for export
 2015-09-10 12:47:25 +02:00
Laurent Destailleur
eb4c46ca3d Fix code generator 2015-09-10 12:13:29 +02:00
Laurent Destailleur
1396ed8f03 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-09-10 12:12:55 +02:00
Florian HENRY
a49f88c259 reveiw thirdparty list and add column and filter on country and typeent 2015-09-10 11:55:05 +02:00
Florian HENRY
6cb993c0b4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-09-10 11:20:03 +02:00
aspangaro
0055606256 Invert 2015-09-10 07:36:17 +02:00
aspangaro
3a90bfa6d3 Merge remote-tracking branch 'Upstream/develop' into develop-60 2015-09-10 06:59:23 +02:00
aspangaro
b1b7966c88 ckeditor: define the default skin when constant don't exist. 2015-09-10 06:58:20 +02:00
Laurent Destailleur
1ad2aeaf2a Removed baf cut and paste 2015-09-10 01:28:39 +02:00
Laurent Destailleur
a4d0e50175 Merge pull request #3489 from AlainRnet/patch-1 
Update lines.php
 2015-09-10 01:23:13 +02:00
Laurent Destailleur
5c0d90ae97 Merge pull request #3497 from aspangaro/develop-RefundVAT 
New: refund VAT - Thanks to icfr for jquery part !
 2015-09-10 01:17:06 +02:00
Laurent Destailleur
87a73b150a Merge pull request #3498 from gschratzer/develop 
FIX #3425 missing Profid keys in companies.lang
 2015-09-10 01:12:54 +02:00
Guido Schratzer
702edac00a FIX: issue #3425 missing Profid keys in companies.lang 
for Austria issue #3425
 2015-09-09 22:16:03 +02:00
aspangaro
15e50ecdb3 Update work 2015-09-09 21:35:41 +02:00
aspangaro
ae6f547ba5 Merge remote-tracking branch 'Upstream/develop' into develop-62 2015-09-09 20:57:28 +02:00
Laurent Destailleur
41803cd868 Merge pull request #3470 from GPCsolutions/develop-3440 
Fix #3440 Only search for core modules in main path
 2015-09-09 20:53:25 +02:00
Laurent Destailleur
2234d95a7b Merge pull request #3481 from grandoc/develop 
translations missing
 2015-09-09 20:52:36 +02:00
Laurent Destailleur
615734012e Merge pull request #3476 from marcosgdf/refactor 
Refactor: Created hasDelay functions
 2015-09-09 20:50:58 +02:00
Laurent Destailleur
a726cd210b Merge pull request #3483 from GPCsolutions/sentry 
Fix regression introduced by f3c71a9a5a
 2015-09-09 20:10:01 +02:00
Laurent Destailleur
870267316b Merge pull request #3484 from GPCsolutions/https 
Qual: Don't attempt HTTPS redirect if already using HTTPS
 2015-09-09 20:09:38 +02:00
Juanjo Menent
70df553814 Merge pull request #3494 from FHenry/3.6 
3.6
 2015-09-09 17:43:07 +02:00
Juanjo Menent
42ac326f07 Merge pull request #3477 from aspangaro/develop-64 
New Accountancy Uniformize code & rename a constant
 2015-09-09 17:38:12 +02:00
Laurent Destailleur
8c1760fbcf Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-09-09 13:26:35 +02:00
Laurent Destailleur
d3f1a7d5b8 FIX Bad condition into invoice export request making reporting too many 
rows.
 2015-09-09 13:26:10 +02:00
Laurent Destailleur
7fd01d4aa3 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/paiement/cheque/class/remisecheque.class.php
	htdocs/product/class/html.formproduct.class.php
	htdocs/product/stock/index.php
	htdocs/product/stock/list.php
	htdocs/product/stock/mouvement.php
	htdocs/product/stock/product.php
	htdocs/product/stock/valo.php
 2015-09-09 12:45:22 +02:00
Laurent Destailleur
f02bd4e756 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-09 12:39:56 +02:00
Laurent Destailleur
3c91b8c890 Force to select "use personalized value" to select a personalized screen 
option.
 2015-09-09 12:39:06 +02:00
philippe grand
79d63e0316 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-09-09 10:13:07 +02:00
Juanjo Menent
d0c2131b09 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-08 21:32:37 +02:00
Juanjo Menent
7d88405058 Fix #3475 RemiseCheque: Undefined variable $date 2015-09-08 21:31:04 +02:00