lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,688 Commits 43 Branches 150 Tags 886 MiB
709bf20deb
Commit Graph

36699 Commits

Author SHA1 Message Date
Laurent Destailleur
709bf20deb Work on prootype for using datatable. 2014-07-27 20:31:11 +02:00
Laurent Destailleur
b964f9e9e3 New: Add info page about browser. 
Qual: Removed dedicated code to change top menu according to
dol_optimize_smallscreen. We must use instead size of screen into css.
 2014-07-27 14:13:25 +02:00
Laurent Destailleur
3d56c8ff6a Fix: [ bug #1537 ] Difference between societe.nom and adherent.societ 2014-07-26 18:20:40 +02:00
Laurent Destailleur
c5b26fa42a Merge pull request #1769 from frederic34/patch-4 
Update llx_c_shipment_mode.sql
 2014-07-26 14:52:44 +02:00
Laurent Destailleur
234ba0ca1c Merge pull request #1770 from frederic34/patch-5 
Update propal.php
 2014-07-26 14:47:54 +02:00
Laurent Destailleur
2bec2b4bec Merge pull request #1774 from fappels/develop 
Fix on bugfix#1317, clean parameters missing
 2014-07-26 14:19:52 +02:00
Laurent Destailleur
3b9cfea8c9 Better function is_ip 2014-07-26 14:16:09 +02:00
Laurent Destailleur
76d4dee411 Merge pull request #1751 from marcosgdf/optimization 
Optimized is_ip dolibarr function
 2014-07-26 14:05:14 +02:00
Francis Appels
df5d4795bf Fix on bugfix#1317, clean parameters missing 
Clean fk_parent before updating fk_parent
 2014-07-25 22:37:23 +02:00
Laurent Destailleur
5aa4d61afe Merge pull request #1773 from icfr/patch-1 
erreur de frappe
 2014-07-25 22:20:43 +02:00
Laurent Destailleur
f1d8f3cb8e Merge pull request #1768 from mika31/patch-1 
Webservice thirdparty / sale representative
 2014-07-25 22:18:57 +02:00
Laurent Destailleur
f9dc010b3c Merge pull request #1767 from frederic34/patch-1 
Update html.form.class.php
 2014-07-25 22:18:19 +02:00
Laurent Destailleur
ed47b27ed9 Merge pull request #1764 from frederic34/patch-3 
Update main.lang
 2014-07-25 22:17:23 +02:00
Laurent Destailleur
5caa7ccd13 Merge pull request #1765 from marcosgdf/patch-3 
Added formConfirm and doAction for supplier invoice card
 2014-07-25 22:17:09 +02:00
Laurent Destailleur
6dddcbfe49 Merge pull request #1763 from frederic34/patch-2 
Update main.lang
 2014-07-25 22:15:30 +02:00
icfr
d61d4778fb erreur de frappe 2014-07-25 19:03:31 +02:00
frederic34
add5328d8f Update propal.php 2014-07-24 18:07:22 +02:00
frederic34
2b3bd260c6 Update llx_c_shipment_mode.sql 2014-07-24 10:26:11 +02:00
frederic34
304e9d2c83 Update llx_c_shipment_mode.sql 
Update GLS tracking url
 2014-07-24 09:45:46 +02:00
mika31
f96f8384e6 Webservice thirdparty / sale representative 
Little patch to add capability to associate (one) sale representative on thirdparty creation.
 2014-07-23 20:23:37 +02:00
frederic34
5239620356 Update main.lang 2014-07-23 10:02:33 +02:00
frederic34
c28c6e578e Update main.lang 2014-07-23 10:00:32 +02:00
frederic34
5ef626813c Update html.form.class.php 2014-07-23 09:49:58 +02:00
Marcos García de La Fuente
f3cbe1beac Task #1511 and updated changelog 2014-07-23 06:20:17 +02:00
Marcos García de La Fuente
1a254b310e Merge remote-tracking branch 'upstream/develop' into optimization 
Conflicts:
	test/phpunit/Functions2LibTest.php
 2014-07-22 04:42:50 +02:00
Marcos García de La Fuente
203dc5518a Merge branch 'develop' into optimization 2014-07-22 04:39:31 +02:00
Marcos García de La Fuente
f5d1d1563b Corrected indentation (again) 2014-07-22 04:27:41 +02:00
Marcos García de La Fuente
c813077f82 Corrected indentation 2014-07-22 04:25:44 +02:00
Marcos García de La Fuente
4f582609f4 Added formConfirm and doAction for supplier invoice card 2014-07-22 04:24:08 +02:00
Laurent Destailleur
76f72d5bcc Fix: pb with pgsql 2014-07-21 23:51:13 +02:00
Laurent Destailleur
0327738aa9 phpcs 2014-07-21 21:07:30 +02:00
frederic34
a01c985018 Update main.lang 2014-07-21 19:21:08 +02:00
frederic34
f0bfe46ebc Update main.lang 2014-07-21 19:19:04 +02:00
Laurent Destailleur
8613cdf24a Merge pull request #1762 from eldy/develop 
A smaller PR from scrutinizer with good advices on doc
 2014-07-21 19:10:10 +02:00
Laurent Destailleur
161f5eadd4 Revert "Scrutinizer Auto-Fixes" 2014-07-21 19:07:56 +02:00
Laurent Destailleur
c024037c62 Merge pull request #1761 from frederic34/patch-1 
Update facture.php
 2014-07-21 19:01:25 +02:00
Scrutinizer Auto-Fixer
42a4af3b6e Scrutinizer Auto-Fixes 
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/eldy/dolibarr/inspections/dce98b05-0037-4277-b1e9-7fd6405a6cd6

Enabled analysis tools:
 - PHP Analyzer
 2014-07-21 18:42:17 +02:00
Juanjo Menent
acaca341ab Fix: [ bug #1521 ] The second order's page from a provider shows all 
orders

Conflicts:
	ChangeLog
 2014-07-21 17:00:59 +02:00
frederic34
f08f4d7c5e Update facture.php 
Remove a space
 2014-07-21 09:18:14 +02:00
Scrutinizer Auto-Fixer
2fdda8cbfb Scrutinizer Auto-Fixes 
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/eldy/dolibarr/inspections/128b4bb3-f689-4974-8fd7-a7b93d012d3f

Enabled analysis tools:
 - PHP Analyzer
 2014-07-20 23:46:38 +02:00
Laurent Destailleur
7ac4a6f43c New: Show amount and status of supplier invoice also on document tab. 2014-07-20 19:35:45 +02:00
Laurent Destailleur
8bc655b44f Fix: Bad alignement of cells 2014-07-20 19:35:00 +02:00
Laurent Destailleur
5572364d2b Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	dev/codesniffer/ruleset.xml
 2014-07-20 16:09:42 +02:00
Laurent Destailleur
8d46b02d67 Fix: missing property 2014-07-20 15:58:05 +02:00
Laurent Destailleur
dec7fe42af Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/commande/fiche.php
 2014-07-20 15:37:50 +02:00
Laurent Destailleur
d7163fe543 Qual: Start to fight deprecated code use reported by 
https://scrutinizer-ci.com/g/eldy/dolibarr/issues/develop?orderField=path&order=asc
 2014-07-20 15:34:33 +02:00
Laurent Destailleur
cfc337a79a Qual: Enable php checkstyle rule Zend.Files.ClosingTag 
Fix: Solve a lot of checkstyle errors.
 2014-07-20 15:27:38 +02:00
Laurent Destailleur
ad104470d8 Fix: CheckStyle 2014-07-20 14:55:18 +02:00
Laurent Destailleur
bd095f597d Fix: CheckStyle 2014-07-20 14:54:30 +02:00
Laurent Destailleur
ecd99608c3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-20 05:14:45 +02:00