lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,728 Commits 43 Branches 150 Tags 886 MiB
98e91bffca
Commit Graph

44728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
98e91bffca Merge branch 'IonAgorria-dinamic-prices' into develop 2014-12-03 13:15:59 +01:00
Laurent Destailleur
1653384415 Merge branch 'dinamic-prices' of github.com:IonAgorria/dolibarr into IonAgorria-dinamic-prices 2014-12-03 13:14:35 +01:00
Laurent Destailleur
f884f16564 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/boxes.php
	htdocs/comm/action/card.php
	htdocs/core/class/html.formfile.class.php
 2014-12-03 12:54:42 +01:00
Laurent Destailleur
07e952a709 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-03 12:47:37 +01:00
Frédéric FRANCE
79314b7ff8 Fix missing space 2014-12-03 12:47:11 +01:00
Laurent Destailleur
1a67ae10a4 Merge pull request #2119 from frederic34/patch-7 
Fix missing space
 2014-12-03 12:46:44 +01:00
Laurent Destailleur
2ddc3cb3f0 Fix: Using a select with checkbox will not be compatible when we will 
add feature to put box on other pages.
 2014-12-03 12:43:14 +01:00
Frédéric FRANCE
58621e7e13 Update boxes.php 2014-12-03 12:32:37 +01:00
Laurent Destailleur
b39b970e52 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-03 12:24:16 +01:00
Laurent Destailleur
6a09bca21e Merge pull request #2120 from frederic34/patch-8 
Update admin config for boxes
 2014-12-03 12:24:03 +01:00
Laurent Destailleur
e90996b2de Merge pull request #2121 from frederic34/patch-10 
Fix missing </div>
 2014-12-03 12:21:29 +01:00
Laurent Destailleur
8f20de603a Merge pull request #2122 from frederic34/patch-11 
Update objectline_view.tpl.php
 2014-12-03 12:20:34 +01:00
Laurent Destailleur
3a476d0daf Merge pull request #2123 from frederic34/patch-12 
Update card.php
 2014-12-03 12:20:00 +01:00
Laurent Destailleur
93e87975b2 Merge pull request #2124 from frederic34/patch-13 
Enhance lisibility of html code
 2014-12-03 12:19:13 +01:00
Laurent Destailleur
d211f8f971 Merge pull request #2126 from frederic34/patch-15 
Update main.inc.php
 2014-12-03 12:18:50 +01:00
Laurent Destailleur
a25b86d03b Merge pull request #2129 from defrance69/patch-31 
Update supplierinvoice_extrafields.php
 2014-12-03 12:17:18 +01:00
Laurent Destailleur
577671e208 Exclude editorconfig from packages 2014-12-03 12:05:31 +01:00
Laurent Destailleur
7afe9de1c0 Start to debug batch/serial module 2014-12-03 00:42:14 +01:00
Laurent Destailleur
c3b74e66ff Fix: Add constant to hide an obscur feature 2014-12-03 00:22:48 +01:00
Laurent Destailleur
bde5a5d307 Fix: Missing translation of batch-serial prouct module 2014-12-03 00:11:31 +01:00
Laurent Destailleur
d87b3ba614 Merge pull request #2115 from frederic34/patch-5 
Add EditorConfig see http://editorconfig.org/
 2014-12-02 19:57:15 +01:00
Laurent Destailleur
a796fea1c8 Merge pull request #2114 from frederic34/patch-4 
Fix mix of space and nbsp
 2014-12-02 19:56:04 +01:00
Frédéric FRANCE
650d4a3da9 Fix missing /form 2014-12-02 19:55:10 +01:00
Laurent Destailleur
c8e1c2bff4 Merge pull request #2113 from frederic34/patch-3 
Fix missing /form
 2014-12-02 19:54:46 +01:00
Frédéric FRANCE
a8386b48e5 Update index.php 2014-12-02 19:53:54 +01:00
Laurent Destailleur
58b8f5b3a5 Merge pull request #2125 from frederic34/patch-14 
Fix replace </td> by </th>
 2014-12-02 19:52:11 +01:00
Laurent Destailleur
758bbb27db Merge pull request #2127 from frederic34/patch-16 
Fix Typo
 2014-12-02 19:50:56 +01:00
Laurent Destailleur
8291a032d9 Fix: Bad translation 2014-12-02 19:38:55 +01:00
Laurent Destailleur
7868d286d3 Update debian tuto 2014-12-02 14:42:21 +01:00
BENKE Charles
3c12d5f420 Update supplierinvoice_extrafields.php 
add orders translation files for correct menu translation error
 2014-12-02 10:36:48 +01:00
Laurent Destailleur
55b7bb532d Fixed: Bad field of default value for fields into predefined/recuring 
invoice tables.
 2014-12-01 23:50:03 +01:00
Laurent Destailleur
253fd83aca Fixed: When invoice is created from subscription, the accountancy code 
was wrong because product added was a free product using default value
for accountancy code. Fix is to choose product into member module
page.
 2014-12-01 13:26:05 +01:00
Laurent Destailleur
da6f3a692b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-01 01:11:42 +01:00
Laurent Destailleur
f3584fa211 Fixed: Button at wrong place 
Fixed: Must use style css span badge for number of files
 2014-12-01 00:53:15 +01:00
Laurent Destailleur
2db6258cb7 Fixed: Button at wrong place 2014-12-01 00:52:38 +01:00
Frédéric FRANCE
3e3dbb1280 Update main.inc.php 2014-11-30 23:53:51 +01:00
Frédéric FRANCE
d0c9b6e9ef Fix Typo 2014-11-30 23:23:30 +01:00
Frédéric FRANCE
b3418b92a3 Update main.inc.php 2014-11-30 23:05:30 +01:00
Frédéric FRANCE
222c275378 Update index.php 2014-11-30 23:04:01 +01:00
Frédéric FRANCE
a3d843f698 Update commonobject.class.php 2014-11-30 22:06:58 +01:00
Frédéric FRANCE
dd18c980fc Update html.form.class.php 2014-11-30 22:00:16 +01:00
Frédéric FRANCE
467274b79b Update card.php 2014-11-30 21:57:10 +01:00
Frédéric FRANCE
ddee145c66 Update objectline_view.tpl.php 2014-11-30 20:28:41 +01:00
Laurent Destailleur
cf646b914d Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-30 18:57:52 +01:00
Frédéric FRANCE
f1fa7e720a Fix missing </div> 2014-11-30 18:33:00 +01:00
Laurent Destailleur
931c1fc671 Sync from transifex 2014-11-30 16:20:58 +01:00
Frédéric FRANCE
aade7309e0 Update boxes.php 2014-11-30 15:56:57 +01:00
Laurent Destailleur
ef4bdcdb2a Merge remote-tracking branch 'origin/3.7' into develop 2014-11-30 15:43:04 +01:00
Ion Agorria
c6e4ff3c41 Renamed module desc file 2014-11-30 15:41:49 +01:00
Laurent Destailleur
86e04cb62f Enhance tool to fix images 2014-11-30 15:40:28 +01:00