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

38596 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
e21d6b0954 Merge pull request #2131 from aspangaro/3.6-patch 
Untranslatable token Calendar in datepicker
 2014-12-03 12:16:55 +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
aspangaro
5a05d4a4b8 Untranslatable token Calendar in datepicker 2014-12-02 20:59:00 +01:00
aspangaro
f6ab7ca0c9 Typo 2014-12-02 20:42:47 +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
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
Philippe GRAND
e18196eac6 to avoid undefined method 2014-12-01 16:50:27 +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
Philippe GRAND
d7dcd153f0 missing close form 2014-12-01 12:21:54 +01:00
Philippe GRAND
b33612d231 close form should be outside button 2014-12-01 12:09:05 +01:00
Philippe GRAND
9118ef7c8f form should be outside table and close form was twice 2014-12-01 12:03:23 +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
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
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
d39dbe66c8 Fix: Removed duplicate entrie into language files 
Renamed tool so all script to run before release start with "fix".
 2014-11-30 14:51:57 +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
e2c606f416 Better translation 2014-11-30 14:12:59 +01:00
Frédéric FRANCE
18f2cfbeac Fix missing space 2014-11-30 13:28:09 +01:00
Frédéric FRANCE
ca3f4a09f4 Update main.inc.php 2014-11-30 13:07:13 +01:00
Ion Agorria
004d88fe0b Fixed error when creating a price selecting a expression without filling the numeric price 2014-11-30 02:15:16 +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
7303983610 Fixed: Ton of old bugs when debugging POS. 2014-11-30 01:35:58 +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
b9ea7d4d13 Fix: Stock decrease from POS 2014-11-29 17:38:12 +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
3fe2db6c8d Try to find a solution to fight against spam sending from dolibarr when 
phpmail is set.
No time to find a better solution so i add just a hidden option to
disable phpmail function.
 2014-11-29 13:50:41 +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
c7420662e6 Fixed: Module for target emailing must not be visible when modules is 
disabled.
 2014-11-29 12:40:45 +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
Laurent Destailleur
cdd256e206 Add info to help understand debug 2014-11-29 12:00:42 +01:00
aspangaro
3db2e46fc6 Typo 2014-11-29 07:41:51 +01:00
aspangaro
30bff7ef28 Need to enable MAIN_ACTIVATE_HTML5 to insert meta balise viewport 2014-11-29 07:12:12 +01:00
aspangaro
c27e2676e3 Modify presentation of login page 2014-11-29 07:08:35 +01:00
aspangaro
64260cde72 Add button in admin->GUISetup to activate Html5 2014-11-29 07:07:27 +01:00
Ion Agorria
4ce8719d98 Fix lang typo 2014-11-29 06:37:49 +01:00
Ion Agorria
6c37d03f13 Added language entries for dinamic prices 2014-11-29 06:32:33 +01:00
Ion Agorria
0fafe3f7d2 Required SQL changes for dinamic prices 2014-11-29 06:31:54 +01:00
Ion Agorria
fac46b3b46 Code for dinamic prices funcionality 2014-11-29 06:31:35 +01:00
Ion Agorria
48e1f4ec55 Library for evaluating math expresions 2014-11-29 06:30:26 +01:00