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

45252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
a5bdf952ee Fix: PHPCS 2014-12-05 17:44:47 +01:00
Laurent Destailleur
c36d362248 Fix: PHPCS 2.0 2014-12-05 17:38:34 +01:00
Laurent Destailleur
d3a22c42ab Try to solve pb with phpcs 2014-12-05 16:45:19 +01:00
Laurent Destailleur
4e181e3763 End test 2014-12-05 16:36:37 +01:00
Laurent Destailleur
b92e2520ea Test travis 2014-12-05 16:08:12 +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
41c9929613 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-05 16:01:23 +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
168e97e6ee Test 2014-12-05 01:28:59 +01:00
Laurent Destailleur
bff65fc6b4 Fix: starting with var with always same color 2014-12-05 01:25:18 +01:00
Laurent Destailleur
b702439bdd Test 2014-12-05 00:39:35 +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
a07852c699 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
 2014-12-04 15:22:08 +01:00
Laurent Destailleur
9e1b0d1abc Prepare 3.5.6 2014-12-04 15:09:47 +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
f6be48f255 Better translation 2014-12-04 14:36:06 +01:00
Laurent Destailleur
9c2485c469 Better explanation 2014-12-04 13:25:20 +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
ec9c3cc115 Fix: Better translation 2014-12-04 11:53:44 +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
782486bb4c Fix: Project with no tasks was not visible 2014-12-04 11:14:02 +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
fe33a2a42e Better translation 2014-12-04 10:06:41 +01:00
Laurent Destailleur
0bc9ae25f0 Fix: Var not defined 2014-12-04 01:42:23 +01:00
Laurent Destailleur
b5d74372de Bad var 2014-12-04 01:36:53 +01:00
Laurent Destailleur
3de0702f2b Fixed: All sql requests are now logged 2014-12-04 01:29:01 +01:00
Laurent Destailleur
c844e35fa1 Fix: Option CASHDESK_SHOW_KEYPAD was not working 2014-12-04 01:26:19 +01:00
Laurent Destailleur
c8c1f7414a Fix: syntax error 2014-12-04 01:23:39 +01:00
Laurent Destailleur
475d749a97 Fix: phpcheckstyle 2014-12-04 01:11:13 +01:00
Laurent Destailleur
557dcf9a20 Include migration script for 3.8 into travis 2014-12-04 00:25:27 +01:00
Laurent Destailleur
6cc46e1985 Include migration script for 3.8 into travis 2014-12-04 00:24:52 +01:00
Laurent Destailleur
f54f14ae04 Fix: W3C table with no tr 2014-12-03 17:16:38 +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
Alexandre SPANGARO
6b3acaa7df Merge pull request #1 from frederic34/patch-6 
Update main.inc.php
 2014-12-03 14:11:52 +01:00
Laurent Destailleur
cdba9b8972 Fix language file 2014-12-03 13:56:38 +01:00
Laurent Destailleur
c614e62c5b Merge remote-tracking branch 'origin/3.7' into develop 2014-12-03 13:29:51 +01:00
Laurent Destailleur
bfdad0ac49 Merge branch 'GPCsolutions-3.7-transifex' into 3.7 2014-12-03 13:28:52 +01:00
Laurent Destailleur
792eba4810 Merge branch '3.7-transifex' of github.com:GPCsolutions/dolibarr into 
GPCsolutions-3.7-transifex

Conflicts:
	htdocs/langs/pt_BR/oscommerce.lang
 2014-12-03 13:28:38 +01:00
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