lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,544 Commits 43 Branches 150 Tags 886 MiB
29fea7bbf4
Commit Graph

28014 Commits

Author SHA1 Message Date
Regis Houssin
a157327859 Fix: strict mode paradise 2012-07-28 11:28:37 +02:00
Regis Houssin
3390a514e1 Fix: include wrong class 2012-07-28 09:57:04 +02:00
Regis Houssin
1e07ed6af6 Fix: broken link 2012-07-28 09:54:47 +02:00
Regis Houssin
a3080acab4 Merge pull request #262 from marcosgdf/minor-fixes-develop 
Pull request #254 into develop
 2012-07-28 00:31:51 -07:00
Regis Houssin
5fb22d689b Fix: best practice 2012-07-28 09:10:09 +02:00
Laurent Destailleur
bf94d05293 New: Add great britain provinces 2012-07-28 03:12:34 +02:00
Laurent Destailleur
7883124958 New: [ task #454 ] Add "No category" into filters on category 2012-07-28 00:53:51 +02:00
Marcos García
c14d9ce13b Typo in es_ES translation 2012-07-28 00:00:46 +02:00
Laurent Destailleur
eb79646315 Fix: restore correct test (empty instead of ! isset) 2012-07-27 23:30:23 +02:00
Laurent Destailleur
a2e745fab6 Fix: Function return was missing in some case. Save bug of empty 
category.
 2012-07-27 23:21:22 +02:00
Marcos García
2204c09e5a Applied commits 16-22 2012-07-27 23:04:05 +02:00
Marcos García
a6c8838b8f Applied patches 9-15 2012-07-27 21:27:03 +02:00
Laurent Destailleur
bd20ab3500 New: Auto check box on page to edit interface options of user. 2012-07-27 20:47:17 +02:00
Laurent Destailleur
1c557a96bd Prepare task 473 2012-07-27 19:26:54 +02:00
Laurent Destailleur
86ac10995f Fix perm 2012-07-27 19:26:38 +02:00
Laurent Destailleur
42d6ed91f7 Fix: Closing tab 2012-07-27 18:41:52 +02:00
Marcos García
5fd7fcb6c4 Applied commits 1-8 2012-07-27 18:40:06 +02:00
Laurent Destailleur
56ced6e5f0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-07-27 16:04:28 +02:00
Laurent Destailleur
0b048ebb94 [ bug #40 ] Export de donnes dangereux 2012-07-27 16:03:20 +02:00
Regis Houssin
6a69b55e5e Fix: tabulation 2012-07-27 14:10:56 +02:00
Raphaël Doursenaud
9ffb6317cf Fix: Allows to use a comma decimal separator in supplier invoices 
payments
 2012-07-27 13:54:16 +02:00
Regis Houssin
20ed6bd5c5 Fix: Bug #460 - Wrong entity assignment when creating a warehouse 2012-07-26 20:52:05 +02:00
Regis Houssin
79181f9183 Fix: add external user filter 2012-07-26 18:24:54 +02:00
Regis Houssin
b2317fd3ee Fix: external user confidentiality 2012-07-26 18:11:06 +02:00
Regis Houssin
5318fb54d5 Fix: bad path 2012-07-26 17:07:10 +02:00
Regis Houssin
b83fbf981d Fix: problem with double quote 2012-07-26 14:33:25 +02:00
Regis Houssin
a6758c2557 Fix: use span instead div for align image warning 2012-07-26 11:34:43 +02:00
Regis Houssin
28a98f6bd9 Fix: wrong action 2012-07-26 10:45:19 +02:00
Regis Houssin
68196e638a Fix: compatibility with edit in place 2012-07-26 09:32:54 +02:00
Laurent Destailleur
ac81e1732e Fix: bad field name 2012-07-26 03:01:15 +02:00
Laurent Destailleur
97906568e3 Typo fix 2012-07-26 02:57:35 +02:00
Laurent Destailleur
ef86d8e2dc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-25 17:39:44 +02:00
Laurent Destailleur
9392cf2832 Update translation for tr_TR 2012-07-25 17:39:17 +02:00
Laurent Destailleur
105e91dfea Fix: Redirect after delete to correct page 2012-07-25 15:03:06 +02:00
Regis Houssin
e3a3dd0454 Fix: it's for margin module 2012-07-25 12:53:02 +02:00
Laurent Destailleur
126979efe1 Fix: All "isset" must not be replaced by "GETPOST". If isset is used to 
know if value is defined (and not to know if value is null), we must
keep the isset.
 2012-07-25 12:25:45 +02:00
Laurent Destailleur
75e9d93e69 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-25 12:21:04 +02:00
Laurent Destailleur
dce9b96260 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/lib/repair.lib.php
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-07-25 12:20:45 +02:00
Regis Houssin
7d2f7e9800 Fix: strict mode crazy 2012-07-25 11:46:33 +02:00
Laurent Destailleur
ea54523181 Checkstyle 2012-07-25 11:40:23 +02:00
Laurent Destailleur
b63820c013 Checkstyle 2012-07-25 11:37:43 +02:00
Laurent Destailleur
7d08bd45d6 Checkstyle 2012-07-25 11:35:34 +02:00
Laurent Destailleur
de621f0567 Fix: Restore compatibility. Try to isolate "charges" feature with 
a condition (i did not understand what it means and goal, i'm afraid
other users should not understand too).
 2012-07-25 11:32:48 +02:00
Laurent Destailleur
758d613908 Fix: Checkstyle 2012-07-25 11:29:45 +02:00
Laurent Destailleur
276e32dc22 Fix: Products with no prices not visible 2012-07-25 11:27:25 +02:00
Laurent Destailleur
b47ced7507 Fix: syntax error 2012-07-25 10:56:30 +02:00
Regis Houssin
e12604cb71 Fix: avoid warning and strict mode story 2012-07-25 09:09:56 +02:00
Regis Houssin
8e953a6858 Fix: external modules workflow compatibility 2012-07-24 20:18:37 +02:00
Regis Houssin
f8f50a722d Fix: patch of Terry (language) 2012-07-24 18:38:35 +02:00
Regis Houssin
65e183c8c9 Merge pull request #258 from FHenry/develop 
Develop
 2012-07-24 09:15:36 -07:00
Regis Houssin
8219ab9ec0 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-24 17:53:43 +02:00
Regis Houssin
c6cd17cf3f Fix: strict mode... far away 2012-07-24 17:52:46 +02:00
FHenry
b3ca737662 remove useless parameters 2012-07-24 17:33:26 +02:00
Laurent Destailleur
24c54ccaf1 Start to work on bug export 2012-07-24 16:19:46 +02:00
FHenry
a2b6abcb85 Fix nb mailling message receive according toher status than error or not 
send
 2012-07-24 14:33:27 +02:00
FHenry
8f2efa4879 Add syslog for debug 2012-07-24 14:25:21 +02:00
FHenry
3892c2ceca Usubscribe mailling module 
- Correct indentation
 2012-07-24 13:24:22 +02:00
FHenry
6fc9bf5143 Correct mail tag __UNSUSCRIBE__ to __UNSUBSCRIBE__ 2012-07-24 10:18:17 +02:00
Regis Houssin
812d02ebe0 Fix: strict mode and $mesgs 2012-07-23 22:04:06 +02:00
Regis Houssin
a4f35bbfd5 Fix: uniformize $mesgs 2012-07-23 21:45:22 +02:00
Regis Houssin
2035eb0b14 Fix: strict mode mini 2012-07-23 21:40:34 +02:00
Regis Houssin
eba0db736e Fix: try to use $mesgs (array) for stock all messages and 
$_SESSION['dol_message'] for specific message when a page is reloading
 2012-07-23 21:31:10 +02:00
Regis Houssin
d5ff308992 Fix: declare $mesg and $mesgs in main.inc.php 
Fix: strict mode be back
 2012-07-23 20:52:55 +02:00
Regis Houssin
9cf088560f Fix: syntax error 2012-07-23 16:47:16 +02:00
Regis Houssin
fb23364511 Fix: uniformize code 2012-07-23 16:10:54 +02:00
Laurent Destailleur
b63505ff15 Better fix 2012-07-23 11:10:18 +02:00
Regis Houssin
01ab1aa66f Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/core/modules/modCommissions.class.php
 2012-07-23 11:07:53 +02:00
Regis Houssin
3fe8b5bc58 Change-Id: Ia9f609c8a1264d245ff5074b981305f7d1792aef 2012-07-23 11:01:52 +02:00
Regis Houssin
bf807c27e5 Fix: uniformize code 2012-07-23 11:01:36 +02:00
Laurent Destailleur
7a8224c4d5 Normalize code 2012-07-23 10:55:29 +02:00
Laurent Destailleur
ea93e62e91 Fix: Checkstyle 2012-07-23 10:46:09 +02:00
Laurent Destailleur
f07c416f76 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-23 10:38:02 +02:00
Regis Houssin
0301e35a44 Merge pull request #256 from marcosgdf/task-195 
Completed Task #195
 2012-07-23 01:37:37 -07:00
Regis Houssin
6e41d645f0 Merge pull request #251 from cbattarel/commissions 
basic commissions management module
 2012-07-23 01:37:09 -07:00
Laurent Destailleur
087cf87722 New: Add state into substitution vars 2012-07-23 10:29:58 +02:00
Regis Houssin
a109d5f32b Fix: bug #467 2012-07-23 10:29:26 +02:00
Laurent Destailleur
1c17767dda Fix: Send instructions must be into core page. 2012-07-22 23:22:40 +02:00
Laurent Destailleur
0eb9b105c9 Fix: Translation missing 2012-07-22 23:07:25 +02:00
Laurent Destailleur
68e619fb00 Fix: escape for create command 2012-07-22 21:50:08 +02:00
Marcos García
568db22649 Renamed fk_methode_commande to fk_input_method 2012-07-22 16:58:37 +02:00
Laurent Destailleur
8080ee4565 Fix: dol_syslog at wrong place. 2012-07-22 16:57:15 +02:00
Laurent Destailleur
970d946e5b Fix: sql injection for create database 2012-07-22 16:53:32 +02:00
Marcos García
e6a192ba87 Renamed fk_demand_reason to fk_input_reason 2012-07-22 16:53:02 +02:00
Marcos García
9eb9fe6d2c Moved bookmark translations from other.lang to bookmarks.lang, also 
removed unused translations

Conflicts:
	htdocs/langs/tr_TR/bookmarks.lang
 2012-07-22 16:44:16 +02:00
Laurent Destailleur
474a67a4a4 Fix: picto 2012-07-22 16:11:23 +02:00
Laurent Destailleur
0d6baa4288 Qual: Enhance codesniffer setup 2012-07-22 14:08:05 +02:00
Laurent Destailleur
c41c5bf797 New: Add help on feature to use it with caution 2012-07-22 13:36:28 +02:00
Laurent Destailleur
72d9f7348c Fix: Missing lang loading 2012-07-22 12:13:53 +02:00
Laurent Destailleur
66ea44886b Fix: Permissions when using web services. 2012-07-22 02:33:21 +02:00
Laurent Destailleur
db4c6bd289 New: After first install, warning are visible onto mandatory setup 
not configured. Show also total number of activated modules.
 2012-07-22 01:03:19 +02:00
Christophe Battarel
b8fa4468ce add commissions module 2012-07-20 16:21:35 +02:00
Regis Houssin
fafd79a0f8 Fix: uniformize code (in progress) 2012-07-20 09:57:50 +02:00
Marcos García
9f3f3703e3 Fixed Catalan typos too 2012-07-19 23:44:36 +02:00
Marcos García
7b478dbb35 Contracts box name wasn't being translated 2012-07-19 23:44:28 +02:00
Marcos García
6039c6f420 Added missing translation and fixed some typos 2012-07-19 23:44:02 +02:00
Marcos García
8233a26422 Fixed some spanish & catalan translations 2012-07-19 23:43:41 +02:00
Regis Houssin
b121a01ef8 Merge pull request #247 from cbattarel/marges 
Margin module
 2012-07-19 10:46:24 -07:00
Marcos García
44a6236b7d Replaced "Seconds" for "seconds" 
Conflicts:
	htdocs/admin/proxy.php
 2012-07-19 19:43:15 +02:00
Raphaël Doursenaud
4f0d43bbc8 French wording 
Réception -> Traitement en cours
 2012-07-19 19:33:05 +02:00
Raphaël Doursenaud
bba9aa4bb4 French spelling 
Chiffre d'affaire -> Chiffre d'affaires
 2012-07-19 19:32:57 +02:00
Raphaël Doursenaud
04a975fbad Text: Chiffrer 2012-07-19 19:32:43 +02:00
Marcos García
319cf18b3b The tab Documents of the Contracts module wasn't being translated 2012-07-19 19:29:43 +02:00
simnandez
7f33e41113 Trad: Better translation 2012-07-19 19:29:30 +02:00
Laurent Destailleur
fb9bf3ddac Fix: Restore menu entry [ bug #455 ] Impossible de crer une facture fournisseur 2012-07-19 18:23:10 +02:00
Laurent Destailleur
69ca9cf7d4 [ bug #445 ] Hex escaping in descriptions 2012-07-19 18:03:25 +02:00
Christophe Battarel
98a2cf547e correct module description and image 2012-07-19 16:27:08 +02:00
Christophe Battarel
8e8fd72459 correct margin infos display on order 2012-07-19 16:25:40 +02:00
Christophe Battarel
34132de71d add charges to supplier prices 2012-07-19 15:36:25 +02:00
Laurent Destailleur
f5b58b6f12 Fix: Missing fields into insert from webservice 2012-07-19 14:26:02 +02:00
Christophe Battarel
55d547348a margin management for invoices 2012-07-19 11:07:50 +02:00
Christophe Battarel
c8e211c864 add missing include 2012-07-19 10:48:01 +02:00
Christophe Battarel
d32091120b margin management for orders 2012-07-19 10:26:26 +02:00
Christophe Battarel
b5c92c7b46 correction in getlinesarray 2012-07-19 10:15:59 +02:00
Christophe Battarel
019b857784 correct display of margin resume table 2012-07-19 09:55:43 +02:00
simnandez
5b3c50dad2 Trad: Add missing translation 2012-07-19 09:13:39 +02:00
Marcos García
98dfa8cd2e Fixed bug https://doliforge.org/tracker/?func=detail&aid=456&atid=246&group_id=144 2012-07-19 09:12:41 +02:00
Laurent Destailleur
1d89c172d0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-07-18 22:41:06 +02:00
Christophe Battarel
9a7935075c correct margin informations when buy_price at zero 2012-07-18 17:29:32 +02:00
Christophe Battarel
8e2fee02df correct default definition for buy_price_ht in migration script 2012-07-18 17:17:00 +02:00
Christophe Battarel
f0f52270a5 adapt to new structure 2012-07-18 17:13:29 +02:00
Christophe Battarel
efba33eb13 adapt to new module structure 2012-07-18 17:00:56 +02:00
Christophe Battarel
411bb993b5 correct path to price.lib.php 2012-07-18 16:49:45 +02:00
Christophe Battarel
bd05495375 correct syntax error 2012-07-18 16:45:34 +02:00
Christophe Battarel
34022de1de correction of syntax error in tpl 2012-07-18 16:43:02 +02:00
Christophe Battarel
c5fe895dce adaptation to new module structure 2012-07-18 16:17:33 +02:00
Christophe Battarel
c12c8bd0bb update margin modules to core module 2012-07-18 16:13:29 +02:00
Christophe Battarel
3844a77395 correct typing bugs 2012-07-18 16:06:36 +02:00
Christophe Battarel
50c2a65b6a add margin infos to templates 2012-07-18 16:01:54 +02:00
Christophe Battarel
1de9dc15bf add margin module 2012-07-18 15:52:15 +02:00
Christophe Battarel
c0ac8c9ae1 fetch margin infos on line object 2012-07-18 15:50:37 +02:00
Christophe Battarel
316f6ce09c add margin infos to commonobject.class.php 2012-07-18 15:26:33 +02:00
Christophe Battarel
58262034cf add extra parameters to control combo in form_thirdparty like in select_company 2012-07-18 15:22:45 +02:00
Christophe Battarel
0cdf208f3d trigger change event when updating item value 2012-07-18 15:17:04 +02:00
Christophe Battarel
122fc5eaa7 update propales for margins 2012-07-18 15:15:54 +02:00
Christophe Battarel
a37707f96f updata database for margin module 2012-07-18 11:39:41 +02:00
Laurent Destailleur
ba25905926 New: [ task #454 ] Add "No category" into filters on category 
combo for product list
 2012-07-18 00:20:33 +02:00
Laurent Destailleur
9116db986f Fix: Restore button to edit products. Fix: the template to use for notes is dolibarr_notes. 2012-07-17 19:45:22 +02:00
Laurent Destailleur
7d9a4f2441 Make code simpler 2012-07-17 19:24:50 +02:00
Laurent Destailleur
73b17dc4c5 New: Make things more clear. 2012-07-17 15:28:34 +02:00
Laurent Destailleur
0021f7d98e New: Use a better format for workflow array: 
- allow more complex permissions/conditions
- allow to define order of options
- can define workflow option not using two modules (can use only one, of
threee or more...)
 2012-07-17 15:27:36 +02:00
Laurent Destailleur
86c59a2460 Better translation 2012-07-17 15:03:04 +02:00
Laurent Destailleur
1831b46bae Fix: Do not show if module disabled 2012-07-17 14:30:10 +02:00
Laurent Destailleur
393f407341 Update turkish language files 2012-07-17 02:33:14 +02:00
Laurent Destailleur
d07e68e12f Fix: Combo list of warehouse not saved. 
Fix: Validate of shipment in error
when using not predefined products.
 2012-07-17 01:22:19 +02:00
Laurent Destailleur
06926e626a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-07-13 17:19:11 +02:00
Regis Houssin
7122b91203 Merge pull request #242 from simnandez/develop 
Fix: Bad local taxes if price base type is TTC
 2012-07-13 07:29:12 -07:00
Regis Houssin
4f458c01f4 Fix: missing entity filter 2012-07-13 16:23:47 +02:00
Laurent Destailleur
035b2d201b Fix: Translation 2012-07-13 16:17:30 +02:00
Laurent Destailleur
a953dbd01c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-07-13 16:13:24 +02:00
simnandez
b8338425f4 Trad: Add missing translations 2012-07-13 15:46:42 +02:00