Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
41,136 Commits 39 Branches 191 Tags
18f4eabbdf7ddfef8aafa4a62c572ef910343a30
Commit Graph

41136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
18f4eabbdf Update conf template 2014-04-06 19:09:10 +02:00
Laurent Destailleur
688ce704ec Fix: Doxygen 2014-04-05 15:14:19 +02:00
Laurent Destailleur
8405ec4816 Syntax error 2014-04-05 14:10:18 +02:00
Laurent Destailleur
c7c640f925 Fix: Can't add user 2014-04-05 12:38:59 +02:00
Laurent Destailleur
d2b1b1a86c Merge branch 'actiontriggers' of 
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-actiontriggers

Conflicts:
	htdocs/langs/de_DE/other.lang
 2014-04-04 23:47:36 +02:00
Laurent Destailleur
925a58028a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-04-02 18:46:23 +02:00
Laurent Destailleur
262efb997f Fix: paddingrightonly must use $right and $left to be compatible with 
LTR languages.
 2014-04-02 18:45:59 +02:00
Laurent Destailleur
b799d6a392 Merge pull request #1523 from GPCsolutions/regensuporder 
Regenerate document on supplier orders steps
 2014-04-02 17:43:03 +02:00
Raphaël Doursenaud
6d7728d9bf Regenerate document on supplier orders steps 2014-04-02 15:37:19 +02:00
Laurent Destailleur
0e23892c71 More consistency trigger name 2014-04-02 15:05:03 +02:00
Laurent Destailleur
637b47cd08 Merge pull request #1522 from GPCsolutions/triggernames 
Qual: keep trigger naming consistent
 2014-04-02 15:02:42 +02:00
Laurent Destailleur
9a8a306d78 Qual: Method form->select_currency() has been removed. Use instead 
print form->selectCurrency().
Qual: Method form->select_methodes_commande() has been renamed into
english name selectInputMethod().
 2014-04-02 14:53:42 +02:00
Laurent Destailleur
3a2caa6e64 New: Can filter on status for supplier order. 2014-04-02 12:48:34 +02:00
Raphaël Doursenaud
3b9696351e Qual: keep trigger naming consistent 2014-04-02 12:22:38 +02:00
Laurent Destailleur
7ac193bb80 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/opensurvey/public/choix_autre.php
 2014-04-02 11:41:55 +02:00
Laurent Destailleur
3f99d9c866 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-04-02 11:36:34 +02:00
Laurent Destailleur
46e46507ec Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/compta/bank/class/account.class.php
	htdocs/compta/bank/index.php
 2014-04-02 11:33:47 +02:00
Laurent Destailleur
8cb06cac08 FIX : [ bug #1317 ] Removing a category does not remove all child 
categories
 2014-04-02 11:27:11 +02:00
Cedric
a4797a0e4a FIX : [ bug #1317 ] Removing a category does not remove all child categories 2014-04-02 11:25:17 +02:00
Laurent Destailleur
663a3bd45c Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-04-02 11:21:11 +02:00
Laurent Destailleur
c421613da9 Merge pull request #1520 from KreizIT/fix_1317 
FIX : [ bug #1317 ] Removing a category does not remove all child categories
 2014-04-02 11:20:47 +02:00
Laurent Destailleur
efcd822c27 Merge pull request #1517 from defrance69/patch-3 
Update propal.class.php
 2014-04-02 11:19:42 +02:00
Laurent Destailleur
ab6a67054a Merge pull request #1516 from marcosgdf/multicompany-fixes 
Fixed a problem with bank accounts sharing across entities
 2014-04-02 11:16:48 +02:00
Laurent Destailleur
487a341a91 Merge pull request #1518 from altairis-fr/develop 
add trigger CREATE_BUYPRICE
 2014-04-02 11:16:21 +02:00
Laurent Destailleur
6806a87ebb Missing tms update 2014-04-02 11:02:18 +02:00
Laurent Destailleur
48c77d2ceb Fix: [ bug #1312 ] Call to undefined function _() 2014-04-02 10:48:20 +02:00
Laurent Destailleur
6dab09e07a Fix: Bad dialog position 2014-04-02 00:04:13 +02:00
Laurent Destailleur
f891e1ac42 Fix: use currency into price function 2014-04-02 00:01:06 +02:00
Cedric
df5a009aa2 FIX : [ bug #1317 ] Removing a category does not remove all child categories 2014-04-01 16:21:20 +02:00
Christophe Battarel
fff9bc1b00 fix bad attribute name 2014-04-01 11:14:54 +02:00
Christophe Battarel
ea74c4738e add trigger CREATE_BUYPRICE 2014-04-01 10:23:57 +02:00
Laurent Destailleur
c969bc3e93 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-04-01 09:13:34 +02:00
Laurent Destailleur
f1466e64af Fix: Build for obs 2014-04-01 09:12:49 +02:00
Laurent Destailleur
d452624ebc Fix: Building on obs 2014-04-01 09:08:52 +02:00
Laurent Destailleur
d2cb5e8d2d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-31 22:56:47 +02:00
Laurent Destailleur
897a9b7446 Sync from transifex. 2014-03-31 19:01:28 +02:00
Raphaël Doursenaud
ab623e3ff1 Fixed typo 2014-03-31 14:21:23 +02:00
Laurent Destailleur
56c7d14b9a We do not force disabling of ckeditor for phones. We let ckeditor 
decide (currently ckeditor is disabled with android).
 2014-03-31 13:25:40 +02:00
Laurent Destailleur
c81406c7f3 Fix: CI 2014-03-31 02:41:15 +02:00
BENKE Charles
f1d9cebb93 Update propal.class.php 
refactoring LibStatut function (small is better)
 2014-03-31 02:38:07 +02:00
Laurent Destailleur
1fad693867 Fix: Removed useless strtolower 2014-03-31 02:25:35 +02:00
Laurent Destailleur
7f23bec7c4 Update changelog 2014-03-31 02:21:45 +02:00
Laurent Destailleur
76259a633c Clean constant FACTURE_TVAOPTION into conf.class.php so we don't have 
to do it everywhere at different places. Value is now 0 or 1.
 2014-03-31 02:16:49 +02:00
Laurent Destailleur
39f48f25db Fix: Trip and expenses were moved into menu hrm 2014-03-31 01:48:50 +02:00
Laurent Destailleur
d48cbeb720 Fix: W3C 2014-03-31 01:45:48 +02:00
Laurent Destailleur
b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/facture/fiche.php
	htdocs/langs/en_US/admin.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/projet/tasks/task.php
 2014-03-31 00:44:45 +02:00
Laurent Destailleur
ed49f88446 Fix: deleting files into backup system tools. 
Fix: Dump using php not not include lock on tables that are deleted.
 2014-03-31 00:19:31 +02:00
Marcos García de La Fuente
e6bd3921f1 Fixed a problem with bank accounts sharing across entities 2014-03-30 23:00:35 +02:00
Laurent Destailleur
3d8fb60f94 Start to implement sepa format. Need serious tests. 2014-03-30 20:22:54 +02:00
Laurent Destailleur
d3dc68d8a7 Prepare script to publish to foundation storage 2014-03-30 19:33:29 +02:00