Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
46,239 Commits 36 Branches 189 Tags
2e68b51a107c9ad90c2d9fee5f9e5f33939b2caa
Commit Graph

7044 Commits

Author SHA1 Message Date
Laurent Destailleur
efe2719f48 Fix: PHPCS 2014-12-05 20:12:32 +01:00
frederic34
5cce8c45e3 WIP PrintIPP 2014-12-05 18:23:54 +01:00
Laurent Destailleur
a5bdf952ee Fix: PHPCS 2014-12-05 17:44:47 +01:00
Laurent Destailleur
a9338a0f9f Fix: Maxi debug of module productbatch. 
Conflicts:
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang
 2014-12-05 16:04:37 +01:00
Laurent Destailleur
5457d3116a Fix: Maxi debug of module productbatch. 2014-12-05 16:01:01 +01:00
Laurent Destailleur
ceba894d57 Start to work on new generation combo box. 2014-12-05 13:26:47 +01:00
Laurent Destailleur
bff65fc6b4 Fix: starting with var with always same color 2014-12-05 01:25:18 +01:00
Laurent Destailleur
8d405a147f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	htdocs/core/tpl/objectline_create.tpl.php
 2014-12-04 15:29:45 +01:00
Laurent Destailleur
6729544782 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/projet/tasks/task.php
 2014-12-04 14:52:34 +01:00
Laurent Destailleur
83122ebe1e Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now 
for release.
 2014-12-04 13:20:56 +01:00
Laurent Destailleur
860d0b0820 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-04 11:29:10 +01:00
Laurent Destailleur
5dbfaec9f8 Enable option PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS by default 2014-12-04 11:18:40 +01:00
Laurent Destailleur
937414e9b1 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-04 11:04:11 +01:00
Laurent Destailleur
76bd7dd512 Fixed: A lot of fixed on project views (info on project area). Also add 
a limit to avoid problem with very large database.
 2014-12-04 11:03:48 +01:00
Laurent Destailleur
b5d74372de Bad var 2014-12-04 01:36:53 +01:00
Laurent Destailleur
1e8e4e7fda Prepare 3.8 dev 
Fix bad test.
Renamed table for dynamic prices.
 2014-12-03 17:06:44 +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
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
aspangaro
5a05d4a4b8 Untranslatable token Calendar in datepicker 2014-12-02 20:59:00 +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
Philippe GRAND
cef835cd2d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2014-12-01 11:27:46 +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
Frédéric FRANCE
d0c9b6e9ef Fix Typo 2014-11-30 23:23:30 +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
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
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
e395fd8096 Fix CRLF 2014-11-30 15:24:39 +01:00
Ion Agorria
c36f94a9a3 Fixed dinamic typo to dynamic 2014-11-30 15:14:25 +01:00
Laurent Destailleur
01209ff844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/product/stock/card.php
 2014-11-30 14:15:38 +01:00
Laurent Destailleur
20e76aa4e6 Fixed: Use constant to hide a feature that will probably be broken. Also 
it is a superfluous feature.
 2014-11-30 02:05:45 +01:00
Laurent Destailleur
7843ed41f3 Fixed: Bad permission 2014-11-29 20:50:05 +01:00
Laurent Destailleur
def4ab5065 Fixed: Missing picto 
Fixed: Menu auguria
Fixed: Default label
 2014-11-29 20:41:09 +01:00
Laurent Destailleur
1797569a6d Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-29 16:44:37 +01:00
Laurent Destailleur
278cdf72d6 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-29 12:41:26 +01:00
Laurent Destailleur
06df952e57 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-11-29 12:40:20 +01:00
Laurent Destailleur
0a7255ccc1 Fixed: Module for target emailing must not be visible when modules is 
disabled.
 2014-11-29 12:38:36 +01:00
Laurent Destailleur
e118d9af22 Fixed: Protection to lock language setup in demo mode was not working 2014-11-29 12:11:12 +01:00
aspangaro
c27e2676e3 Modify presentation of login page 2014-11-29 07:08:35 +01:00
Ion Agorria
fac46b3b46 Code for dinamic prices funcionality 2014-11-29 06:31:35 +01:00
Laurent Destailleur
d3b32ce22f Fixed: Bad function/picto for information messages (not a star) 2014-11-28 19:49:42 +01:00
Frédéric FRANCE
369f802112 Fix mix of space and nbsp 2014-11-28 08:50:37 +01:00
aspangaro
1c89186652 Merge remote-tracking branch 'Upstream/develop' into develop-html5 2014-11-28 06:20:01 +01:00