Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,166 Commits 35 Branches 179 Tags 1.7 GiB
1ca4e377d5
Commit Graph

38877 Commits

Author SHA1 Message Date
Laurent Destailleur
1ca4e377d5 Merge remote-tracking branch 'origin/3.6' into 3.7 2015-02-20 23:47:09 +01:00
Laurent Destailleur
d9ab05833f Merge pull request #2370 from braito4/patch-1 
[FIX #1833] Permissions in contact/note.php wrong
 2015-02-20 23:31:55 +01:00
Laurent Destailleur
6952f33309 Restore data into bannner of thirdparty to have content matching other 
tabs.
 2015-02-20 23:29:55 +01:00
Laurent Destailleur
9ac38dee45 Merge pull request #2367 from marcosgdf/bug-1652 
Fix: [ bug #1652 ] Margin tab should not be shown for thirds not clients
 2015-02-20 23:27:53 +01:00
Laurent Destailleur
56635cea98 Merge branch 'bug-1790' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1790

Conflicts:
	ChangeLog
 2015-02-20 23:23:57 +01:00
Laurent Destailleur
938936b8f2 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/core/lib/functions.lib.php
 2015-02-20 22:51:47 +01:00
Laurent Destailleur
f423386518 Sync lang 2015-02-20 20:20:12 +01:00
Laurent Destailleur
e1e31de229 Merge remote-tracking branch 'origin/3.5' into 3.6 2015-02-20 20:15:04 +01:00
Laurent Destailleur
d549c00b2e Merge pull request #2365 from marcosgdf/3.5 
Fix: [ bug #1846 ] Browser IE11 not detected
 2015-02-20 20:02:11 +01:00
Laurent Destailleur
9e078b32d2 Fixes the way the RUM number is generated. Start phpunit test. 2015-02-20 18:35:52 +01:00
Laurent Destailleur
dba050fd43 Fix: tags h correctly supported 2015-02-20 15:55:55 +01:00
Laurent Destailleur
41196c01e9 Add hidden option FCKEDITOR_ALLOW_ANY_CONTENT to solve bug of editor not 
accepting all html tags from templates.
 2015-02-20 15:48:54 +01:00
Marcos García de La Fuente
d46c76311c Correction 2015-02-20 10:23:17 +01:00
Laurent Destailleur
639aaebacb Merge branch 'bug-1825' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1825

Conflicts:
	ChangeLog
 2015-02-19 09:47:22 +01:00
Laurent Destailleur
ec56667f5e Fix: [ bug #1849 ] Broken flag image when a contact does not have a 
country set
 2015-02-19 09:44:22 +01:00
Laurent Destailleur
d1a4b6c2c5 phpcs 2015-02-19 00:04:35 +01:00
Laurent Destailleur
774389940e Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/propal/list.php
	htdocs/compta/bank/ligne.php
	htdocs/compta/resultat/clientfourn.php
	htdocs/compta/salaries/fiche.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/facture/paiement.php
 2015-02-18 23:51:41 +01:00
Laurent Destailleur
e7d95f553b Merge remote-tracking branch 'origin/3.5' into 3.6 2015-02-18 23:43:22 +01:00
Laurent Destailleur
271bcb5313 Merge pull request #2354 from aspangaro/3.7-patch2 
FIXED All constants COMPTA_* was renamed in ACCOUNTING_*
 2015-02-18 23:27:47 +01:00
Laurent Destailleur
d7dcf28c61 Merge branch '3.7' of https://github.com/atm-gauthier/dolibarr into 
atm-gauthier-3.7

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-02-18 23:15:40 +01:00
Laurent Destailleur
2d2930b421 Merge pull request #2348 from tiaris/3.7_actionclassbug 
fetch must contain an left join on c_actioncom for correct function
 2015-02-18 23:02:44 +01:00
Laurent Destailleur
ceb3920381 Merge pull request #2346 from aaujon/3.6-webservice-order 
fix typo in createOrder
 2015-02-18 23:00:06 +01:00
Laurent Destailleur
22fdcfc272 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-02-18 22:54:44 +01:00
Laurent Destailleur
4963555669 Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-misc

Conflicts:
	htdocs/barcode/codeinit.php
 2015-02-18 22:54:02 +01:00
Laurent Destailleur
ead6b4bf95 Merge branch 'bug-1830' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1830

Conflicts:
	ChangeLog
 2015-02-18 22:50:12 +01:00
Laurent Destailleur
fc415fc3c9 Fix: [ bug #1826 ] Supplier payment types are not translated in 
fourn/facture/paiement.php
 2015-02-18 22:44:42 +01:00
Laurent Destailleur
6d25cf6f6a Merge branch 'bug-1832' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1832

Conflicts:
	ChangeLog
 2015-02-18 22:41:32 +01:00
Laurent Destailleur
06c90e67bb Merge pull request #2339 from KreizIT/fix_1829 
FIXED: #1829 POS not compatible with batch products
 2015-02-18 22:38:19 +01:00
Laurent Destailleur
8f339712ab Merge pull request #2338 from aaujon/3.6-webservice-product-barcode 
FIXED : product webservice can now save barcode
 2015-02-18 22:24:20 +01:00
Laurent Destailleur
89b9364837 Merge pull request #2337 from marcosgdf/bug-1822 
Fix: [ bug #1822 ] SQL error in clientfourn.php report with PostgreSQL
 2015-02-18 22:23:07 +01:00
Laurent Destailleur
9f8bee3501 Merge pull request #2331 from altatof/fix_natural_search 
FIX: select DISTINCT for natural search on proposal list (in the same way it's done in invoices list)
 2015-02-18 22:16:43 +01:00
Laurent Destailleur
cc1d506614 Miscelaneous debug on barcode features. 2015-02-18 21:01:17 +01:00
braito4
ca64763440 Update note.php 
Error in the security check
 2015-02-17 18:09:16 +01:00
Laurent Destailleur
ad67fe50a3 Correct management when delivery date is universal time format. 2015-02-17 17:21:41 +01:00
Laurent Destailleur
685b8d722d Fix: Bad hook name 2015-02-17 16:46:37 +01:00
Maxime Kohlhaas
0a1ade22c8 Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6 2015-02-17 15:15:46 +01:00
Marcos García de La Fuente
529d4447ef Fix: [ bug #1652 ] Margin tab should not be shown for thirds not clients 2015-02-17 00:04:31 +01:00
Laurent Destailleur
5688e8ecd8 Add todo to show code is missing here 2015-02-16 20:51:05 +01:00
Laurent Destailleur
1e78d0e8d4 New: Introduce hidden option 
STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS to solve, with no risk, a
missing control on missing warehouse.
 2015-02-16 20:46:54 +01:00
Laurent Destailleur
03d19bf77f Fix: Sort criteria 2015-02-16 18:02:25 +01:00
Laurent Destailleur
118ae7e8f8 Backport fix done into dev. 2015-02-16 17:55:53 +01:00
Marcos García de La Fuente
3efb737cbf Fix: [ bug #1845 ] Undefined "$conf->browser->ie" var in "functions.lib.php" 2015-02-16 12:30:10 +01:00
Marcos García de La Fuente
6f08893016 Fix: [ bug #1846 ] Browser IE11 not detected 2015-02-16 12:26:20 +01:00
Marcos García de La Fuente
0a81fe667f Fix: [ bug #1825 ] External agenda: hide/show checkbox doesn't work 2015-02-16 10:44:10 +01:00
Laurent Destailleur
3cf4b80baa Fix missing test of action when using canvas 2015-02-16 02:02:11 +01:00
Laurent Destailleur
2045fb22e9 Lock 5.5.40 2015-02-15 23:39:30 +01:00
Laurent Destailleur
9ab48b3d90 Revert "Trad" 
This reverts commit bb2c33e2c1.
 2015-02-15 22:51:18 +01:00
Laurent Destailleur
bb2c33e2c1 Trad 2015-02-15 22:49:53 +01:00
Laurent Destailleur
eef1e17c61 Fix: default vat 2015-02-15 19:38:20 +01:00
Marcos García de La Fuente
2c074a94f3 Fix: [ bug #1790 ] Sending a test mail from admin page, gives "File already exists" error 2015-02-15 15:57:38 +01:00